X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=1d.js;h=a24f5bd699cdee2f8612591b75dd5f3929d33056;hb=26a8f8ddaa0becf3b923ace41a976c04598d00bd;hp=cac53ea2afeb8a0544019d86f002bdf40a75e14f;hpb=62b73ae19321e18709f44efd9d290ef0722b04d8;p=cellular-automaton.git

diff --git a/1d.js b/1d.js
index cac53ea..a24f5bd 100644
--- a/1d.js
+++ b/1d.js
@@ -1,7 +1,7 @@
 $(document).ready(function(){
     
-    var cells = 20;
-    var generations = 10;
+    var cells = 100;
+    var generations = 100;
 
     var state = {
         '000' : '0',
@@ -14,11 +14,11 @@ $(document).ready(function(){
         '111' : '0',
     }
 
-    var canvas = document.getElementById('canvas')
+    var canvas = $('#1d-automaton')[0];
     var c = canvas.getContext('2d');
 
-    var cellWidth = Math.floor(canvas.width / cells);
-    var cellHeight = Math.floor(canvas.height / generations);
+    var cellWidth = canvas.width / cells;
+    var cellHeight = canvas.height / generations;
     var generation = 0;
 
     function cell(x, y, h, l) {
@@ -43,6 +43,8 @@ $(document).ready(function(){
         var world = [];
         var x = 0;
         var y = 0;
+        generation = 0;
+        generations = 100;
         for (var i = 0; i < cells; i++) {
             world.push(new cell(x, y, cellWidth, cellHeight));
             x += cellWidth;
@@ -66,7 +68,13 @@ $(document).ready(function(){
     }
 
     var world = populate_world();
-    while (generations) { generate(); generations-- }
+    while (generations - generation) { generate();}
     //var tick_id = setInterval(generate, 100);
 
+    $('#controls #regenerate-automaton').click(function(e){
+        c.clearRect(0,0,canvas.width,canvas.height);
+        world = populate_world();
+        while (generations - generation) { generate(); }
+    });
+
 });