diff --git a/src/main/java/lab/BulletAnimated.java b/src/main/java/lab/BulletAnimated.java index 4ec882be11642f8fbf0a9276942739a4c1beaad3..d98b7f03f14fa9f6e086d8aa84827819c7b069f7 100644 --- a/src/main/java/lab/BulletAnimated.java +++ b/src/main/java/lab/BulletAnimated.java @@ -49,10 +49,10 @@ public class BulletAnimated { double cannonAngle = cannon.getAngle(); speed = speed .add(new Point2D(Math.cos(cannonAngle) * strenghtOfCannon, Math.sin(cannonAngle) * strenghtOfCannon) - .multiply(1 / mass)); + .multiply(1 / mass * timeStep * 10)); } else if (!hitToGround) { accelerate = false; - Point2D acceleration = new Point2D(0, -Constants.GRAVITATIONAL_ACCELERATION*50 * mass); + Point2D acceleration = new Point2D(0, -Constants.GRAVITATIONAL_ACCELERATION*50 * mass * timeStep * 10); speed = speed.add(acceleration.multiply(timeStep)); } if (!hitToGround) { diff --git a/src/main/java/lab/Cannon.java b/src/main/java/lab/Cannon.java index 92c54310524127224b89db59c3b840b7709df328..f62ad473e01ef3ebeb3d8d0ba4bd2afce514c063 100644 --- a/src/main/java/lab/Cannon.java +++ b/src/main/java/lab/Cannon.java @@ -13,7 +13,7 @@ public class Cannon { private Point2D size; private World world; - + private final double speed = 20; public Cannon(World world, Point2D position, Point2D size) { @@ -24,7 +24,7 @@ public class Cannon { } public void simulate(double timeStep) { - angle = angle + direction*0.8; + angle = angle + direction*speed*timeStep; if(angle <=-90 || angle >= 0) { direction*=-1; }