1 files changed, 44 insertions, 43 deletions
diff --git a/src/client/views/nodes/PhysicsSimulationWeight.tsx b/src/client/views/nodes/PhysicsSimulationWeight.tsx
index f7755dc5c..e77cfa96a 100644
--- a/src/client/views/nodes/PhysicsSimulationWeight.tsx
+++ b/src/client/views/nodes/PhysicsSimulationWeight.tsx
@@ -190,7 +190,6 @@ export default class Weight extends React.Component<IWeightProps, IState> {
     }
 
     if (this.props.simulationReset != prevProps.simulationReset) {
-      console.log('reset sim')
       this.resetEverything();
     }
     if (this.props.adjustPendulumAngle != prevProps.adjustPendulumAngle) {
@@ -210,59 +209,58 @@ export default class Weight extends React.Component<IWeightProps, IState> {
     }
     // Update x start position
     if (this.props.startPosX != prevProps.startPosX) {
-      console.log('update start x pos')
       this.setState({updatedStartPosX: this.props.dataDoc['startPosX']})
       this.setState({xPosition: this.props.dataDoc['startPosX']})
       this.setXPosDisplay(this.props.dataDoc['startPosX']);
     }
     // Update y start position
     if (this.props.startPosY != prevProps.startPosY) {
-      console.log('update start y pos')
       this.setState({updatedStartPosY: this.props.dataDoc['startPosY']})
       this.setState({yPosition: this.props.dataDoc['startPosY']})
       this.setYPosDisplay(this.props.dataDoc['startPosY']);
     }
-    if (this.state.xVelocity != prevState.xVelocity) {
-      console.log('check for kinetic friction')
-      if (this.props.dataDoc['wedge']  && this.state.xVelocity != 0 && !this.state.kineticFriction) {
-        this.setState({kineticFriction: true});
-        //switch from static to kinetic friction
-        const normalForce: IForce = {
-          description: "Normal Force",
-          magnitude:
-            this.forceOfGravity.magnitude *
-            Math.cos(Math.atan(this.props.dataDoc['wedgeHeight']  / this.props.dataDoc['wedgeWidth'] )),
-          directionInDegrees:
-            180 - 90 - (Math.atan(this.props.dataDoc['wedgeHeight']  / this.props.dataDoc['wedgeWidth'] ) * 180) / Math.PI,
-        };
-        let frictionForce: IForce = {
-          description: "Kinetic Friction Force",
-          magnitude:
-          this.props.dataDoc['coefficientOfKineticFriction'] *
-            this.forceOfGravity.magnitude *
-            Math.cos(Math.atan(this.props.dataDoc['wedgeHeight']  / this.props.dataDoc['wedgeWidth'] )),
-          directionInDegrees:
-            180 - (Math.atan(this.props.dataDoc['wedgeHeight']  / this.props.dataDoc['wedgeWidth'] ) * 180) / Math.PI,
-        };
-        // reduce magnitude of friction force if necessary such that block cannot slide up plane
-        let yForce = -this.forceOfGravity.magnitude;
-        yForce +=
-          normalForce.magnitude *
-          Math.sin((normalForce.directionInDegrees * Math.PI) / 180);
-        yForce +=
-          frictionForce.magnitude *
-          Math.sin((frictionForce.directionInDegrees * Math.PI) / 180);
-        if (yForce > 0) {
-          frictionForce.magnitude =
-            (-normalForce.magnitude *
-              Math.sin((normalForce.directionInDegrees * Math.PI) / 180) +
-              this.forceOfGravity.magnitude) /
+    if (!this.props.dataDoc['simulationPaused']) {
+      if (this.state.xVelocity != prevState.xVelocity) {
+        if (this.props.dataDoc['wedge']  && this.state.xVelocity != 0 && !this.state.kineticFriction) {
+          this.setState({kineticFriction: true});
+          //switch from static to kinetic friction
+          const normalForce: IForce = {
+            description: "Normal Force",
+            magnitude:
+              this.forceOfGravity.magnitude *
+              Math.cos(Math.atan(this.props.dataDoc['wedgeHeight']  / this.props.dataDoc['wedgeWidth'] )),
+            directionInDegrees:
+              180 - 90 - (Math.atan(this.props.dataDoc['wedgeHeight']  / this.props.dataDoc['wedgeWidth'] ) * 180) / Math.PI,
+          };
+          let frictionForce: IForce = {
+            description: "Kinetic Friction Force",
+            magnitude:
+            this.props.dataDoc['coefficientOfKineticFriction'] *
+              this.forceOfGravity.magnitude *
+              Math.cos(Math.atan(this.props.dataDoc['wedgeHeight']  / this.props.dataDoc['wedgeWidth'] )),
+            directionInDegrees:
+              180 - (Math.atan(this.props.dataDoc['wedgeHeight']  / this.props.dataDoc['wedgeWidth'] ) * 180) / Math.PI,
+          };
+          // reduce magnitude of friction force if necessary such that block cannot slide up plane
+          let yForce = -this.forceOfGravity.magnitude;
+          yForce +=
+            normalForce.magnitude *
+            Math.sin((normalForce.directionInDegrees * Math.PI) / 180);
+          yForce +=
+            frictionForce.magnitude *
             Math.sin((frictionForce.directionInDegrees * Math.PI) / 180);
-        }
-        if (this.props.dataDoc['coefficientOfKineticFriction'] != 0) {
-          this.props.dataDoc['updatedForces'] = [this.forceOfGravity, normalForce, frictionForce];
-        } else {
-          this.props.dataDoc['updatedForces'] = ([this.forceOfGravity, normalForce]);
+          if (yForce > 0) {
+            frictionForce.magnitude =
+              (-normalForce.magnitude *
+                Math.sin((normalForce.directionInDegrees * Math.PI) / 180) +
+                this.forceOfGravity.magnitude) /
+              Math.sin((frictionForce.directionInDegrees * Math.PI) / 180);
+          }
+          if (this.props.dataDoc['coefficientOfKineticFriction'] != 0) {
+            this.props.dataDoc['updatedForces'] = [this.forceOfGravity, normalForce, frictionForce];
+          } else {
+            this.props.dataDoc['updatedForces'] = ([this.forceOfGravity, normalForce]);
+          }
         }
       }
     }
@@ -503,6 +501,9 @@ export default class Weight extends React.Component<IWeightProps, IState> {
     this.setState({yVelocity: yVel});
     this.setState({xPosition: xPos});
     this.setState({yPosition: yPos});
+    
+    console.log("start forces" this.props.dataDoc['startForces'])
+    console.log("updated forces" this.props.dataDoc['updatedForces'])
     this.props.dataDoc['updatedForces'] = (this.getNewForces(xPos, yPos, xVel, yVel));
   };