aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/nodes/PhysicsSimulationBox.tsx
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/views/nodes/PhysicsSimulationBox.tsx')
-rw-r--r--src/client/views/nodes/PhysicsSimulationBox.tsx56
1 files changed, 20 insertions, 36 deletions
diff --git a/src/client/views/nodes/PhysicsSimulationBox.tsx b/src/client/views/nodes/PhysicsSimulationBox.tsx
index 9d91adefb..13b4fe0b2 100644
--- a/src/client/views/nodes/PhysicsSimulationBox.tsx
+++ b/src/client/views/nodes/PhysicsSimulationBox.tsx
@@ -61,7 +61,7 @@ export default class PhysicsSimulationBox extends ViewBoxAnnotatableComponent<Fi
this.dataDoc.coefficientOfStaticFriction = 0;
this.dataDoc.currentForceSketch = [];
this.dataDoc.deleteMode = false;
- this.dataDoc.displayChange = {xDisplay: 0, yDisplay: 0};
+ this.dataDoc.updateDisplay = false;
this.dataDoc.elasticCollisions = false;
this.dataDoc.forceSketches = [];
this.dataDoc.pendulum = false;
@@ -264,25 +264,25 @@ export default class PhysicsSimulationBox extends ViewBoxAnnotatableComponent<Fi
componentDidMount() {
- // Add weight
- this.addPendulum()
+ // Add weight
+ this.addPendulum()
- // Add listener for SHIFT key, which determines if sketch force arrow will be edited or deleted on click
- document.addEventListener("keydown", (e) => {
- if (e.shiftKey) {
- this.dataDoc.deleteMode = true;
- }
- });
- document.addEventListener("keyup", (e) => {
- if (e.shiftKey) {
- this.dataDoc.deleteMode = false;
- }
- });
+ // Add listener for SHIFT key, which determines if sketch force arrow will be edited or deleted on click
+ document.addEventListener("keydown", (e) => {
+ if (e.shiftKey) {
+ this.dataDoc.deleteMode = true;
+ }
+ });
+ document.addEventListener("keyup", (e) => {
+ if (e.shiftKey) {
+ this.dataDoc.deleteMode = false;
+ }
+ });
- // Timer for animating the simulation
- setInterval(() => {
- this.dataDoc.timer = this.dataDoc.timer+1;
- }, 60);
+ // // Timer for animating the simulation
+ // setInterval(() => {
+ // this.dataDoc.timer = this.dataDoc.timer+1;
+ // }, 60);
}
render () {
@@ -297,26 +297,8 @@ export default class PhysicsSimulationBox extends ViewBoxAnnotatableComponent<Fi
color={"red"}
dataDoc={this.dataDoc}
mass={1}
- pendulum={this.dataDoc.pendulum}
- pendulumAngle={this.dataDoc.pendulumAngle}
- pendulumLength={this.dataDoc.pendulumLength}
radius={this.radius}
- reset={this.dataDoc.simulationReset}
- showForceMagnitudes={this.dataDoc.showForceMagnitudes}
- showAcceleration={this.dataDoc.showAcceleration}
- showForces={this.dataDoc.showForces}
- showVelocity={this.dataDoc.showVelocity}
- startForces={this.dataDoc.startForces}
- startPosX={this.dataDoc.startPosX}
- startPosY={this.dataDoc.startPosY}
timestepSize={0.002}
- updateDisplay={this.dataDoc.displayChange}
- updatedForces={this.dataDoc.updatedForces}
- walls={this.dataDoc.wallPositions}
- wedge={this.dataDoc.wedge}
- wedgeHeight={this.dataDoc.wedgeHeight}
- wedgeWidth={this.dataDoc.wedgeWidth}
- coefficientOfKineticFriction={this.dataDoc.coefficientOfKineticFriction}
xMax={this.xMax}
yMax={this.yMax}
xMin={this.xMin}
@@ -354,11 +336,13 @@ export default class PhysicsSimulationBox extends ViewBoxAnnotatableComponent<Fi
<div>
{this.dataDoc.simulationPaused && (
<button onClick={() => {
+ console.log('start sim')
this.dataDoc.simulationPaused = false}
} >START</button>
)}
{!this.dataDoc.simulationPaused && (
<button onClick={() => {
+ console.log('pause sim')
this.dataDoc.simulationPaused = true}
} >PAUSE</button>
)}