X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=2d.js;h=8669d2e05d1d14e399b0e365dce42fb844241695;hb=86b4e9d5307c2232a7e7da94832760a850d7722d;hp=b919ec8f0f373e2a799f2c760aea19abae94be84;hpb=51bd9981da7e8a44780c1c6ccfbc7b8d37fd65d3;p=cellular-automaton.git

diff --git a/2d.js b/2d.js
index b919ec8..8669d2e 100644
--- a/2d.js
+++ b/2d.js
@@ -1,6 +1,6 @@
 $(document).ready(function(){
     
-    var canvas = document.getElementById('canvas')
+    var canvas = $('#2d-automaton')[0];
     var c = canvas.getContext('2d');
 
     var rows = 50;
@@ -25,13 +25,8 @@ $(document).ready(function(){
             c.fillRect(this.x, this.y, this.h, this.l);
             this.state = 1;
         }
-        this.redraw = function() {
-            c.fillStyle = this.state == 1 ? "rgb(0,0,0)" : "rgb(255,255,255)";
-            c.fillRect(this.x, this.y, this.h, this.l);
-        }
-        this.highlight = function() {
-            c.fillStyle = "rgb(0,0,100)";
-            c.fillRect(this.x, this.y, this.h, this.l);
+        this.toggle = function() {
+            this.state ? this.kill() : this.revive();
         }
     }
 
@@ -51,15 +46,6 @@ $(document).ready(function(){
             this.population.push(world);
         }
 
-        this.print = function() {
-            for (var i = 0; i < rows; i++) {
-                var s = '';
-                for (var ii = 0; ii < columns; ii++) {
-                    s += this.population[i][ii];
-                }
-            }
-        }
-
         this.highlight = function() {
             for (var i = 0; i < rows; i++) {
                 for (var ii = 0; ii < columns; ii++) {
@@ -121,33 +107,39 @@ $(document).ready(function(){
     }
 
     var automaton = new universe;
-    var seed = $.extend(true, {}, automaton);
     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();
-        $('#controls #highlight-seed').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 #reset-automaton').click(function(e){
-        clearInterval(tickID);
+    $('#controls #reseed-automaton').click(function(e){
+        if (running) clearInterval(tickID);
         $('#controls #stop-automaton').hide();
         $('#controls #start-automaton').show();
-        automaton = $.extend(true, {}, seed);
-        $('#generation')[0].innerHTML = automaton.generation;
-        automaton.redraw();
+        running = 0;
+        automaton = new universe;
     });
 
-    $('#controls #highlight-seed').click(function(e){
-        seed.highlight();
+    $('#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();
+        }
     });
 
 });