disinclined.org / git / cellular-automaton.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0089a72)
merged 1d and 2d automaton into one page
authorDylan Lloyd <dylan@dylansserver.com>
Sun, 16 Dec 2012 18:10:25 +0000 (13:10 -0500)
committerDylan Lloyd <dylan@dylansserver.com>
Sun, 16 Dec 2012 18:10:25 +0000 (13:10 -0500)
1d.js patch | blob | history
2d.js patch | blob | history
index.php patch | blob | history
style.css patch | blob | history

diff --git a/1d.js b/1d.js
index bff03cb..ed76608 100644 (file)
--- a/1d.js
+++ b/1d.js
@@ -14,11 +14,11 @@ $(document).ready(function(){
         '111' : '0',
     }
 
-    var canvas = document.getElementById('canvas')
+    var canvas = document.getElementById('1d-automaton')
     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) {
diff --git a/2d.js b/2d.js
index b919ec8..46ccc75 100644 (file)
--- a/2d.js
+++ b/2d.js
@@ -1,6 +1,6 @@
 $(document).ready(function(){
     
-    var canvas = document.getElementById('canvas')
+    var canvas = document.getElementById('2d-automaton')
     var c = canvas.getContext('2d');
 
     var rows = 50;
diff --git a/index.php b/index.php
index c95cf4c..43d4837 100644 (file)
--- a/index.php
+++ b/index.php
@@ -3,20 +3,30 @@
     <title>cellular automaton</title>
     <link type='text/css' rel='stylesheet' href='style.css'>
     <script type='text/javascript' src='jquery-core.js'></script>
+    <script type='text/javascript' src='1d.js'></script>
     <script type='text/javascript' src='2d.js'></script>
   </head>
   <body>
-    <div id='container'>
-      <canvas width='750px' height='750px' id='canvas'></canvas>
+    <div id='2d-container'>
+      <canvas width='750px' height='750px' id='2d-automaton'></canvas>
       <div id='controls'>
         <h1>2D</h1>
+        <span class='label'>Generation: <span id='generation'>0</span></span>
+        <span class='label'>2500 cells</span>
+        <br><br>
         <span id='start-automaton' class='control'>Start automaton</span>
         <span id='stop-automaton' class='control'>Stop automaton</span>
         <span id='reset-automaton' class='control'>Reset automaton</span>
         <span id='highlight-seed' class='control'>Highlight seed</span>
-        <br><br>
-        <span class='label'>2500 cells</span><br>
-        <span class='label'>Generation: <span id='generation'>0</span></span>
+      </div>
+    </div>
+    <div id='1d-container'>
+      <canvas width='750px' height='750px' id='1d-automaton'></canvas>
+      <div id='controls'>
+        <h1>1D</h1>
+        <br>
+        <span class='label'>100 Generations</label><br>
+        <span class='label'>100 Cells</label>
       </div>
     </div>
   </body>
diff --git a/style.css b/style.css
index 6663281..08b7991 100644 (file)
--- a/style.css
+++ b/style.css
@@ -8,10 +8,10 @@ canvas {
     }
 #controls .control, #controls .label {
     font-weight: bold;
-}
+    }
 #controls .control {
     cursor: pointer;
-}
+    }
 #highlight-seed, #stop-automaton {
     display: none;
-}
+    }
1D and 2D cellular automaton on a HTML canvas