diff --git a/src/yugecin/opsudance/movers/HalfEllipseMover.java b/src/yugecin/opsudance/movers/HalfEllipseMover.java index a5132430..f3444458 100644 --- a/src/yugecin/opsudance/movers/HalfEllipseMover.java +++ b/src/yugecin/opsudance/movers/HalfEllipseMover.java @@ -44,7 +44,7 @@ public class HalfEllipseMover extends Mover { @Override public double[] getPointAt(int time) { double Tangle = Math.PI * getT(time) * dir; - double x = middlex + Math.cos(Tangle) * radius * mod; // TODO fix this + double x = middlex + Math.cos(Tangle) * radius; double y = middley + Math.sin(Tangle) * radius * mod; double dx = middlex - x; double dy = middley - y; @@ -55,7 +55,7 @@ public class HalfEllipseMover extends Mover { return new double[] { middlex - Math.cos(my) * d, - middley - Math.sin(my) * d + middley + Math.sin(my) * d }; } diff --git a/src/yugecin/opsudance/movers/QuartCircleMover.java b/src/yugecin/opsudance/movers/QuartCircleMover.java index e5da3be0..36e68b37 100644 --- a/src/yugecin/opsudance/movers/QuartCircleMover.java +++ b/src/yugecin/opsudance/movers/QuartCircleMover.java @@ -29,8 +29,8 @@ public class QuartCircleMover extends Mover { public QuartCircleMover(GameObject start, GameObject end, int dir) { super(start, end, dir); - middlex = (startX - endX) / 2d; - middley = (startY - endY) / 2d; + middlex = (startX + endX) / 2d; + middley = (startY + endY) / 2d; radius = Utils.distance(middlex, middley, startX, startY); ang = Math.atan2(startY - middley, startX - middlex) + Math.PI / 2d * dir; middlex = middlex + Math.cos(ang) * radius; @@ -45,7 +45,7 @@ public class QuartCircleMover extends Mover { return new double[] { middlex + Math.cos(ang) * radius, - middlex + Math.sin(ang) * radius + middley + Math.sin(ang) * radius }; }