aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/client/views/nodes/PhysicsSimulationApp.tsx6
-rw-r--r--src/client/views/nodes/PhysicsSimulationWall.tsx5
-rw-r--r--src/client/views/nodes/PhysicsSimulationWeight.tsx7
3 files changed, 10 insertions, 8 deletions
diff --git a/src/client/views/nodes/PhysicsSimulationApp.tsx b/src/client/views/nodes/PhysicsSimulationApp.tsx
index 608a38f1a..a2490cce8 100644
--- a/src/client/views/nodes/PhysicsSimulationApp.tsx
+++ b/src/client/views/nodes/PhysicsSimulationApp.tsx
@@ -298,9 +298,9 @@ export default class App extends React.Component<{}, IState> {
addWalls = () => {
if (this.state.wallPositions.length == 0) {
let walls = [];
- walls.push({ length: 70, xPos: 0, yPos: 80, angleInDegrees: 0 });
- walls.push({ length: 80, xPos: 0, yPos: 0, angleInDegrees: 90 });
- walls.push({ length: 80, xPos: 69.5, yPos: 0, angleInDegrees: 90 });
+ walls.push({ length: 100, xPos: 0, yPos: 97, angleInDegrees: 0 });
+ walls.push({ length: 100, xPos: 0, yPos: 0, angleInDegrees: 90 });
+ walls.push({ length: 100, xPos: 97, yPos: 0, angleInDegrees: 90 });
this.setState({wallPositions: walls})
}
};
diff --git a/src/client/views/nodes/PhysicsSimulationWall.tsx b/src/client/views/nodes/PhysicsSimulationWall.tsx
index d502c066a..f6396d6a7 100644
--- a/src/client/views/nodes/PhysicsSimulationWall.tsx
+++ b/src/client/views/nodes/PhysicsSimulationWall.tsx
@@ -18,13 +18,12 @@ export default class App extends React.Component<IWallProps> {
}
wallStyle = {
- width: this.props.angleInDegrees == 0 ? this.props.length + "%" : "5px",
- height: this.props.angleInDegrees == 0 ? "5px" : this.props.length + "%",
+ width: this.props.angleInDegrees == 0 ? this.props.length + "%" : "3%",
+ height: this.props.angleInDegrees == 0 ? "3%" : this.props.length + "%",
position: "absolute" as "absolute",
left: this.props.xPos + "%",
top: this.props.yPos + "%",
backgroundColor: "#6c7b8b",
- zIndex: -1000,
margin: 0,
padding: 0,
};
diff --git a/src/client/views/nodes/PhysicsSimulationWeight.tsx b/src/client/views/nodes/PhysicsSimulationWeight.tsx
index 07ab84bd8..92d65cf3d 100644
--- a/src/client/views/nodes/PhysicsSimulationWeight.tsx
+++ b/src/client/views/nodes/PhysicsSimulationWeight.tsx
@@ -93,8 +93,8 @@ export default class Weight extends React.Component<IWeightProps, IState> {
directionInDegrees: 270,
};
xMax = 300;
- xMin = 0;
yMax = 300;
+ xMin = 0;
yMin = 0;
// Var
@@ -397,6 +397,7 @@ export default class Weight extends React.Component<IWeightProps, IState> {
this.setState({xPosition: wallX+5});
}
collision = true;
+ console.log('collision with wall')
}
} else {
if (maxX >= wallX) {
@@ -407,6 +408,7 @@ export default class Weight extends React.Component<IWeightProps, IState> {
this.setState({xPosition: wallX - 2 * this.props.radius + 5});
}
collision = true;
+ console.log('collision with wall')
}
}
}
@@ -421,8 +423,9 @@ export default class Weight extends React.Component<IWeightProps, IState> {
if (this.state.yVelocity > 0) {
this.props.walls.forEach((wall) => {
if (wall.angleInDegrees == 0) {
- const groundY = (wall.yPos / 100) * 300;
+ const groundY = (wall.yPos / 100) * this.yMax;
if (maxY >= groundY) {
+ console.log('collision with ground ', wall, maxY)
if (this.props.elasticCollisions) {
this.setState({yVelocity: -this.state.yVelocity})
} else {