X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=2d.js;h=f88df4644c7649dee8a6db526706deac967f377b;hb=38f7ba15e16ee3708a4e7237bb19acfe588a31f6;hp=9460aa71d5bb3c8df99fdc4478d3e65f1cc161b9;hpb=4aff4ddc2edf85b1eb846c7e126545f1a9e9bd33;p=cellular-automaton.git

diff --git a/2d.js b/2d.js
index 9460aa7..f88df46 100644
--- a/2d.js
+++ b/2d.js
@@ -1,6 +1,6 @@
 $(document).ready(function(){
     
-    var canvas = document.getElementById('2d-automaton')
+    var canvas = $('#2d-automaton')[0];
     var c = canvas.getContext('2d');
 
     var rows = 50;
@@ -25,11 +25,15 @@ $(document).ready(function(){
             c.fillRect(this.x, this.y, this.h, this.l);
             this.state = 1;
         }
+        this.toggle = function() {
+            this.state ? this.kill() : this.revive();
+        }
     }
 
-    function universe() {
+    function universe(blank) {
         this.population = [];
         this.generation = 0;
+        var blank = blank || 0;
 
         for (var i = 0; i < rows; i++) {
             var world = [];
@@ -38,7 +42,8 @@ $(document).ready(function(){
             for (var ii = 0; ii < columns; ii++) {
                 world.push(new cell(x, y, cellWidth, cellHeight));
                 x += cellWidth;
-                Math.random() > .5 ? world[ii].revive() : world[ii].kill();
+                if (blank) { world[ii].kill(); }
+                else { Math.random() > .5 ? world[ii].revive() : world[ii].kill(); }
             }
             this.population.push(world);
         }
@@ -105,17 +110,46 @@ $(document).ready(function(){
 
     var automaton = new universe;
     var tickID = 0;
+    var running = 0;
 
     $('#controls #start-automaton').click(function(e){
         tickID = setInterval(function(){tick(automaton)}, 100);
         $('#controls #start-automaton').hide();
         $('#controls #stop-automaton').show();
+        running = 1;
     });
 
     $('#controls #stop-automaton').click(function(e){
-        clearInterval(tickID);
+        if (running) clearInterval(tickID);
+        $('#controls #stop-automaton').hide();
+        $('#controls #start-automaton').show();
+        running = 0;
+    });
+
+    $('#controls #reseed-automaton').click(function(e){
+        if (running) clearInterval(tickID);
+        $('#controls #stop-automaton').hide();
+        $('#controls #start-automaton').show();
+        automaton = new universe();
+        running = 0;
+    });
+
+    $('#controls #custom-seed-automaton').click(function(e){
+        if (running) clearInterval(tickID);
         $('#controls #stop-automaton').hide();
         $('#controls #start-automaton').show();
+        automaton = new universe(1);
+        running = 0;
+    });
+
+    $('#2d-automaton').click(function(e) {
+        if (!running) {
+            var x = e.pageX - $('#2d-automaton').offset().left;
+            var y = e.pageY - $('#2d-automaton').offset().top;
+            var row = Math.floor(y / cellHeight);
+            var column = Math.floor(x / cellWidth);
+            automaton.population[row][column].toggle();
+        }
     });
 
 });