timeline integration

01_Code/physical_computing_interface/graph/main.js

@@ -272,6 +272,9 @@ document.addEventListener('DOMContentLoaded', function(){
     }, false);
 
     function addEdges(x,y,z){
+        x=parseInt(x);
+        y=parseInt(y);
+        z=parseInt(z);
         for (var i=-1;i<=1;i++) {
             for (var j=-1;j<=1;j++) {
                 for (var k=-1;k<=1;k++) {
@@ -288,6 +291,12 @@ document.addEventListener('DOMContentLoaded', function(){
                         // ignore the item we're looking for neighbours for
                         if(!outofbound )
                         {   
+                            // console.log(i1);
+                            // console.log(j1);
+                            // console.log(k1);
+                            // console.log(x);
+                            // console.log(y);
+                            // console.log(z);
                             if (!(i1==x && j1==y && k1==z)&& occupancy[i1][j1][k1]) {
                                 var tgt=cy.$id('[' +x +"," +y+","+z+']');
                                 tgt._private.data.data.neighbors.push('[' +i1 +"," +j1+","+k1+']');

01_Code/physical_computing_interface/main.js

@@ -3,6 +3,9 @@ var voxelSpacing=50;
 //////////////////////events//////////////////
 
 function addNode (x,y,z,replay=false){
+    x=parseInt(x);
+    y=parseInt(y);
+    z=parseInt(z);
     var addNodeEvent = new CustomEvent('addNode', { 
         detail: 
         {
@@ -20,6 +23,9 @@ function addNode (x,y,z,replay=false){
 }
 
 function removeNode (x,y,z,replay=false){
+    x=parseInt(x);
+    y=parseInt(y);
+    z=parseInt(z);
     var removeNodeEvent = new CustomEvent('removeNode', { 
         detail: 
         {

01_Code/physical_computing_interface/threejs/assembly.js

@@ -21,7 +21,7 @@ for (var i=0;i<gridSize;++i){
     }
 }
 var timeStepOccupancy=[];
-timeStepOccupancy.push(occupancy.slice());
+timeStepOccupancy.push([occupancy.slice()]);
 
 ////////////////////////
 document.addEventListener('addNode', function (e) { 
@@ -39,7 +39,6 @@ document.addEventListener('addNode', function (e) {
 document.addEventListener('removeNode', function (e) { 
     if(!e.detail.replay){
         console.log("Remove:"+e.detail.x+" "+e.detail.y+" "+e.detail.z);
-        
         adjustTimeStep(false,e.detail.x,e.detail.y,e.detail.z);
         
     }else{
@@ -48,17 +47,15 @@ document.addEventListener('removeNode', function (e) {
 }, false);
 
 document.addEventListener('adjustTimeStep', function (e) { 
-    timeStepOccupancy.push(timeStepOccupancy[totalTimeSteps]);
+    timeStepOccupancy.push([timeStepOccupancy[totalTimeSteps][0]]);
     totalTimeSteps++;
-    console.log(timeStepOccupancy.length);
-    console.log(totalTimeSteps);
-    timeStepOccupancy[totalTimeSteps][e.detail.x][e.detail.y][e.detail.z]=e.detail.addRemove;
-    occupancy=timeStepOccupancy[totalTimeSteps];
+    timeStepOccupancy[totalTimeSteps][0][e.detail.x][e.detail.y][e.detail.z]=e.detail.addRemove;
+    occupancy=timeStepOccupancy[totalTimeSteps][0];
 
     
     slider.max=totalTimeSteps;
     slider.value=totalTimeSteps;
-    timeline.push(e.detail);
+    timeline.push([e.detail]);
     replay(totalTimeSteps-1);
     timeStep=totalTimeSteps;
     
@@ -72,27 +69,31 @@ function replay(currValue){
     if(currValue<timeStep){
         for(var i=timeStep;i>currValue;i--) {
             var ii=i-1;
-          occupancy=timeStepOccupancy[i];
-          if(!timeline[ii].addRemove){
-              addNode(timeline[ii].x,timeline[ii].y,timeline[ii].z,true);
+            for(var j=0;j<timeline[ii].length;j++) {
+                occupancy=timeStepOccupancy[ii][j];
+                // console.log(occupancy);
+                if(!timeline[ii][j].addRemove){
+                    addNode(timeline[ii][j].x,timeline[ii][j].y,timeline[ii][j].z,true);
                 }else{
-              removeNode(timeline[ii].x,timeline[ii].y,timeline[ii].z,true);
+                    removeNode(timeline[ii][j].x,timeline[ii][j].y,timeline[ii][j].z,true);
+                }
             }
-          
         }
-  
     }else if (currValue>timeStep){
         for(var i=timeStep;i<currValue;i++) {
             var ii=i;
-          occupancy=timeStepOccupancy[i];
-          if(timeline[ii].addRemove){
-              addNode(timeline[ii].x,timeline[ii].y,timeline[ii].z,true);
+            for(var j=0;j<timeline[ii].length;j++) {
+                occupancy=timeStepOccupancy[ii][j];
+                // console.log(occupancy);
+                if(timeline[ii][j].addRemove){
+                    addNode(timeline[ii][j].x,timeline[ii][j].y,timeline[ii][j].z,true);
                 }else{
-              removeNode(timeline[ii].x,timeline[ii].y,timeline[ii].z,true);
+                    removeNode(timeline[ii][j].x,timeline[ii][j].y,timeline[ii][j].z,true);
+                }
             }
         }
     }else{
-        console.log("No Replay!");
+        // console.log("No Replay!");
     }
     
     timeStep=currValue;