resolve #3

Author: junhg0211

static/component.js

@@ -75,8 +75,8 @@ class Socket {
     this.onCount = 0;
   }
 
-  changeState(state) {
-    if (state === this.on) return;
+  changeState(state, forceCalculate) {
+    if (state === this.on && !forceCalculate) return;
 
     this.on = state;
     this.surface.color = state ? Socket.ON_COLOR : Socket.OFF_COLOR;
@@ -85,7 +85,7 @@ class Socket {
       getConnectedWires(this).forEach(wire => wire.calculate());
     } else {
       let connectedComponent = getConnectedComponent(this);
-      componentCalculationQueue.push(connectedComponent)
+      componentCalculationQueue.push(connectedComponent);
     }
 
     this.tickCount++;
@@ -260,7 +260,7 @@ class Component {
     this.outSockets.forEach(socket => socket.render());
   }
 
-  calculate() {}
+  calculate(forceCalculate) {}
 
   delete() {
     this.inSockets.forEach(socket => getConnectedWires(socket).forEach(wire => wire.delete()));
@@ -418,8 +418,8 @@ class TrueComponent extends Component {
     this.calculate();
   }
 
-  calculate() {
-    this.outSockets[0].changeState(true);
+  calculate(forceCalculate) {
+    this.outSockets[0].changeState(true, forceCalculate);
   }
 
   flatten() {
@@ -435,8 +435,8 @@ class NotComponent extends Component {
     this.calculate();
   }
 
-  calculate() {
-    this.outSockets[0].changeState(!this.inSockets[0].on);
+  calculate(forceCalculate) {
+    this.outSockets[0].changeState(!this.inSockets[0].on, forceCalculate);
   }
 
   getSignal() {
@@ -461,8 +461,8 @@ class OrComponent extends Component {
     this.calculate();
   }
 
-  calculate() {
-    this.outSockets[0].changeState(this.inSockets[0].on || this.inSockets[1].on);
+  calculate(forceCalculate) {
+    this.outSockets[0].changeState(this.inSockets[0].on || this.inSockets[1].on, forceCalculate);
   }
 
   getSignal() {
@@ -507,8 +507,8 @@ class IntegratedComponent extends Component {
     this.components.forEach(component => component.tick());
   }
 
-  calculate() {
-    this.inComponents.forEach(component => component.calculate());
+  calculate(forceCalculate) {
+    this.inComponents.forEach(component => component.calculate(forceCalculate));
   }
 
   getSignal() {
@@ -733,7 +733,7 @@ function getClosestSocket(boardX, boardY) {
   return closestSocket;
 }
 
-function connectWire(fromSocket, toSocket, camera) {
+function connectWire(fromSocket, toSocket, camera, calculateFlag) {
   let wire = new Wire(fromSocket, toSocket, camera);
 
   // check if wire is already existing,
@@ -763,7 +763,8 @@ function connectWire(fromSocket, toSocket, camera) {
     });
   }
   wires.push(wire);
-  wire.calculate();
+  if (calculateFlag === undefined || calculateFlag === true)
+    wire.calculate();
 }
 
 function getClosestComponent(x, y) {

static/index.js

@@ -197,6 +197,7 @@ function tickAbstraction() {
 let cpf = 0;  // calculations per frame
 let ccList = [];  // calculation components count
 let cccDelta = 0;
+let forceCalculationQueue = [];
 function tickCalculateComponents() {
   cpf = 0;
   if (cccDelta > FPS * 5) {
@@ -206,7 +207,12 @@ function tickCalculateComponents() {
   for (let i = 0; i < calculationLimit && componentCalculationQueue.length > 0; i++) {
     let component = componentCalculationQueue.shift();
     if (component) {
-      component.calculate();
+      let forceIndex = forceCalculationQueue.indexOf(component);
+      let forceCalculate = forceIndex !== -1;
+      component.calculate(forceCalculate);
+      if (forceCalculate) {
+        forceCalculationQueue.splice(forceIndex, 1);
+      }
       if (ccList.indexOf(component.id) === -1) {
         ccList.push(component.id);
       }

static/pack.js

@@ -1,3 +1,62 @@
+function getIndexRecursively(component, components) {
+  let index = components.indexOf(component);
+  if (index !== -1) return [index];
+
+  let result;
+  components.filter(c => c instanceof IntegratedComponent).forEach((ic, i) => {
+    let index = getIndexRecursively(component, ic.components);
+    if (index === undefined) result = [i];
+    else if (index.length > 0) result = [i, ...index];
+  });
+
+  return result;
+}
+
+function stringifyTab(tab, abstractComponentIds) {
+  let result = {
+    name: tab.name,
+    components: [],
+    wireIndexes: [],
+    queuedComponentIndexes: []
+  };
+  // result.wireIndexes will contain the socket addresses of components.
+  // for example, if enabled (state = true) wire A is originally connected from result.components[1]'s 1st outSockets
+  // to result.components[0]'s 2nd inSockets, wire A will be represented as [1, 0, 0, 1, true].
+  //
+  // result.queuedComponentIndexes will contain the index of components in result.components
+  // which must be also contained on componentCalculationQueue when this stringified tab is structured.
+
+  tab.components.forEach(component => {
+    if (component instanceof IntegratedComponent && abstractComponentIds.indexOf(component.integrationId) !== -1) {
+      result.components.push(makeBlueprintString(component, component.getSignal()));
+    } else {
+      result.components.push(component.flatten())
+    }
+  });
+
+  tab.wires.forEach(wire => {
+    let fromSocket = wire.fromSocket;
+    let toSocket = wire.toSocket;
+
+    let fromSocketComponent = getConnectedComponent(fromSocket, tab.components, true);
+    let toSocketComponent = getConnectedComponent(toSocket, tab.components, true);
+
+    result.wireIndexes.push([
+      tab.components.indexOf(fromSocketComponent),
+      fromSocketComponent.outSockets.indexOf(fromSocket),
+      tab.components.indexOf(toSocketComponent),
+      toSocketComponent.inSockets.indexOf(toSocket),
+      wire.on
+    ]);
+  });
+
+  tab.componentCalculationQueue.forEach(component => {
+    result.queuedComponentIndexes.push(getIndexRecursively(component, tab.components));
+  });
+
+  return result;
+}
+
 /*
  * creating the packed project
  */
@@ -87,10 +146,20 @@ function load(projectJSON) {
       // SI = socket index
       let fromComponent = components[fromCI], toComponent = components[toCI];
       let fromSocket = fromComponent.outSockets[fromSI], toSocket = toComponent.inSockets[toSI];
-      connectWire(fromSocket, toSocket, camera);
+      connectWire(fromSocket, toSocket, camera, false);
     });
 
-    tab.queuedComponentIndexes.forEach(index => componentCalculationQueue.push(components[index]));
+    // tab.queuedComponentIndexes.forEach(index => componentCalculationQueue.push(components[index]));
+    tab.queuedComponentIndexes.forEach(indexList => {
+      let item = components;
+      while (indexList.length > 0) {
+        item = item[indexList.shift(0)];
+        if (item instanceof IntegratedComponent)
+          item = item.components;
+      }
+      componentCalculationQueue.push(item);
+      forceCalculationQueue.push(item);
+    });
   });
 
   changeTab(projectJSON.nowTab);

static/tab.js

@@ -45,51 +45,5 @@ function changeTab(name) {
   pathDiv.innerText = name;
 }
 
-function stringifyTab(tab, abstractComponentIds) {
-  let result = {
-    name: tab.name,
-    components: [],
-    wireIndexes: [],
-    queuedComponentIndexes: []
-  };
-  // result.wireIndexes will contain the socket addresses of components.
-  // for example, if enabled (state = true) wire A is originally connected from result.components[1]'s 1st outSockets
-  // to result.components[0]'s 2nd inSockets, wire A will be represented as [1, 0, 0, 1, true].
-  //
-  // result.queuedComponentIndexes will contain the index of components in result.components
-  // which must be also contained on componentCalculationQueue when this stringified tab is structured.
-
-  tab.components.forEach(component => {
-    if (component instanceof IntegratedComponent && abstractComponentIds.indexOf(component.integrationId) !== -1) {
-      result.components.push(makeBlueprintString(component, component.getSignal()));
-    } else {
-      result.components.push(component.flatten())
-    }
-  });
-
-  tab.wires.forEach(wire => {
-    let fromSocket = wire.fromSocket;
-    let toSocket = wire.toSocket;
-
-    let fromSocketComponent = getConnectedComponent(fromSocket, tab.components, true);
-    let toSocketComponent = getConnectedComponent(toSocket, tab.components, true);
-
-    result.wireIndexes.push([
-      tab.components.indexOf(fromSocketComponent),
-      fromSocketComponent.outSockets.indexOf(fromSocket),
-      tab.components.indexOf(toSocketComponent),
-      toSocketComponent.inSockets.indexOf(toSocket),
-      wire.on
-    ]);
-  });
-
-  tab.componentCalculationQueue.forEach(component => {
-    if (tab.componentCalculationQueue.indexOf(component) !== -1)
-      result.queuedComponentIndexes.push(tab.components.indexOf(component));
-  });
-
-  return result;
-}
-
 createTab(nowTab);
 changeTab(nowTab);