Skip to content

Commit

Permalink
loads of updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Manuel Ernst committed Nov 18, 2017
1 parent e720251 commit 1de4b95
Show file tree
Hide file tree
Showing 10 changed files with 4,930 additions and 122 deletions.
20 changes: 6 additions & 14 deletions frontend/implementations/circleWorld/circleWorld.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,12 @@
targetColor: [200, 0, 0]
});

$('#calc').click(function () {
circles.run();
});

$('#restart').click(function () {
circles.restart();
});
circles.setInterval(5000);

$('#reset').click(function () {
circles.reset();
});

$('.speed').click(function() {
circles.setInterval($(this).val());
});
$('#calc').click(() => circles.run());
$('#restart').click(() => circles.restart());
$('#reset').click(() => circles.reset());
$('.speed').click(e => circles.setInterval(e.target.value));
});
</script>

Expand All @@ -40,6 +31,7 @@
<input type="button" id="restart" value="restart">
<input type="button" id="reset" value="reset"><br>
<br>
<input type="button" id="speed5000" value="5000" class="speed">
<input type="button" id="speed1000" value="1000" class="speed">
<input type="button" id="speed100" value="100" class="speed">
<input type="button" id="speed10" value="10" class="speed">
Expand Down
20 changes: 14 additions & 6 deletions frontend/implementations/circleWorld/circleWorldBlue.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,21 @@
});
});
</script>

<style>
#aliens {
width: 1000px;
height: 800px;
margin: 0 auto;
}
</style>
</head>
<body>
<input type="button" id="calc" value="calc">
<input type="button" id="restart" value="restart">
<input type="button" id="reset" value="reset">
<br><br>
<canvas id="canvas"></canvas>
<div id="aliens">
<input type="button" id="calc" value="calc">
<input type="button" id="restart" value="restart">
<input type="button" id="reset" value="reset">
<br><br>
<canvas id="canvas"></canvas>
</div>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,21 @@
});
</script>

<style>
#aliens {
width: 1000px;
height: 800px;
margin: 0 auto;
}
</style>
</head>
<body>
<input type="button" id="calc" value="calc"> <input type="button" id="restart" value="restart"> <input type="button" id="reset" value="reset">
<br><br>
<input type="button" id="redTarget" value="red"> <input type="button" id="blueTarget" value="blue"> <input type="button" id="yellowTarget" value="yellow"> <input type="button" id="greenTarget" value="green">
<br><br>
<canvas id="canvas"></canvas>
<div id="aliens">
<input type="button" id="calc" value="calc"> <input type="button" id="restart" value="restart"> <input type="button" id="reset" value="reset">
<br><br>
<input type="button" id="redTarget" value="red"> <input type="button" id="blueTarget" value="blue"> <input type="button" id="yellowTarget" value="yellow"> <input type="button" id="greenTarget" value="green">
<br><br>
<canvas id="canvas"></canvas>
</div>
</body>
</html>
31 changes: 20 additions & 11 deletions frontend/implementations/circleWorld/circleWorldNoMutation.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,27 @@
});
});
</script>


<style>
#aliens {
width: 1000px;
height: 800px;
margin: 0 auto;
}
</style>
</head>
<body>
<input type="button" id="calc" value="calc">
<input type="button" id="restart" value="restart">
<input type="button" id="reset" value="reset"><br>
<br>
<input type="button" id="speed1000" value="1000" class="speed">
<input type="button" id="speed100" value="100" class="speed">
<input type="button" id="speed10" value="10" class="speed">
<input type="button" id="speed1" value="1" class="speed">
<br><br>
<canvas id="canvas"></canvas>
<div id="aliens">
<input type="button" id="calc" value="calc">
<input type="button" id="restart" value="restart">
<input type="button" id="reset" value="reset"><br>
<br>
<input type="button" id="speed1000" value="1000" class="speed">
<input type="button" id="speed100" value="100" class="speed">
<input type="button" id="speed10" value="10" class="speed">
<input type="button" id="speed1" value="1" class="speed">
<br><br>
<canvas id="canvas"></canvas>
</div>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,19 @@
});
</script>

<style>
#aliens {
width: 1000px;
height: 800px;
margin: 0 auto;
}
</style>
</head>
<body>
<input type="button" id="calc" value="calc"> <input type="button" id="restart" value="restart"> <input type="button" id="reset" value="reset">
<br><br>
<canvas id="canvas"></canvas>
<div id="aliens">
<input type="button" id="calc" value="calc"> <input type="button" id="restart" value="restart"> <input type="button" id="reset" value="reset">
<br><br>
<canvas id="canvas"></canvas>
</div>
</body>
</html>
Loading

0 comments on commit 1de4b95

Please sign in to comment.