Merge remote-tracking branch 'refs/remotes/origin/Curving'

src/awlex/ospu/polymover/ArcMover.java

@@ -8,19 +8,19 @@ import static java.lang.Math.*;
 /**
  * Created by Awlex on 13.11.2016.
  */
-public class Arc extends PolyMover {
+public class ArcMover extends PolyMover {
 	
 	private GameObject p1, middle, p2;
 	private double xm, ym, r, alpha, beta, gamma;
 	
-	public Arc(GameObject p1, GameObject middle, GameObject p2) {
+	public ArcMover(GameObject p1, GameObject middle, GameObject p2) {
 		this.p1 = p1;
 		this.middle = middle;
 		this.p2 = p2;
 		init();
 	}
 	
-	public Arc(PolyMover mover, GameObject p) {
+	public ArcMover(PolyMover mover, GameObject p) {
 		GameObject[] items = mover.getItems();
 		p1 = items[items.length - 2];
 		middle = items[items.length - 1];
@@ -30,27 +30,22 @@ public class Arc extends PolyMover {
 	
 	private void init() {
 		Matrix m = prepareMatrix(p1, middle, p2);
-		xm = m.get(2, 1);
-		ym = m.get(3, 1);
-		r = pow(xm, 2) + pow(ym, 2) - m.get(1, 1);
+		xm = m.get(1, 0) * 0.5;
+		ym = m.get(2, 0) * 0.5;
+		r = sqrt(pow(xm, 2) + pow(ym, 2) - m.get(0, 0));
 		alpha = atan2(p1.end.y - ym, p1.end.x - xm);
 		beta = atan2(middle.end.y - ym, middle.end.x - xm);
 		gamma = atan2(p2.start.y - ym, p2.start.x - xm);
 	}
 	
 	@Override
-	public double[] getPoint(int time) {
-		double percent;
+	public double[] getPointAt(int time) {
 		double angle;
 		if (time < middle.getTime()) {
-			time -= p1.getEndTime();
-			percent = ((double) time) / ((middle.getTime() - p1.getEndTime()));
-			angle = alpha + beta * percent;
+			angle = alpha + beta * ((double) time - p1.getEndTime()) / ((middle.getTime() - p1.getEndTime()));
 		}
 		else {
-			time -= middle.getTime();
-			percent = ((double) time) / (p2.getTime() - middle.getTime());
-			angle = beta + gamma * percent;
+			angle = beta + gamma * ((double) time - middle.getTime()) / (p2.getTime() - middle.getTime());
 		}
 		return new double[]{
 			xm + r * cos(angle),
@@ -67,7 +62,7 @@ public class Arc extends PolyMover {
 		};
 	}
 	
-	private Matrix prepareMatrix(GameObject p1, GameObject middle, GameObject p2) {
+	private static Matrix prepareMatrix(GameObject p1, GameObject middle, GameObject p2) {
 		Matrix a = new Matrix(new double[][]{
 			{1, -p1.end.x, -p1.end.y},
 			{1, -middle.end.x, -middle.end.y},
@@ -83,6 +78,11 @@ public class Arc extends PolyMover {
 	}
 	
 	public static boolean canCricleExistBetweenItems(GameObject p1, GameObject p2, GameObject p3) {
-		return !((p1.end.x == p2.start.x && p1.end.x == p3.start.x) || (p1.end.y == p2.start.y && p1.end.y == p3.start.y));
+		try {
+			prepareMatrix(p1, p2, p3);
+		} catch (RuntimeException e) {
+			return false;
+		}
+		return true;
 	}
 }

src/awlex/ospu/polymover/LineMover.java

@@ -0,0 +1,32 @@
+package awlex.ospu.polymover;
+
+import itdelatrisu.opsu.objects.DummyObject;
+import itdelatrisu.opsu.objects.GameObject;
+import yugecin.opsudance.movers.LinearMover;
+
+/**
+ * Created by Awlex on 19.11.2016.
+ */
+public class LineMover extends PolyMover {
+	
+	GameObject[] objects;
+	
+	public LineMover(GameObject[] objects, int startIndex, int count) {
+		this.objects = new GameObject[count];
+		System.arraycopy(objects, startIndex, this.objects, 0, count);
+	}
+	
+	@Override
+	public double[] getPointAt(int time) {
+		int i = 0;
+		while (time > objects[i].getTime() && i < objects.length - 1)
+			i++;
+		
+		return new LinearMover(i == 0 ? new DummyObject() : objects[i - 1], objects[i], 1).getPointAt(time);
+	}
+	
+	@Override
+	public GameObject[] getItems() {
+		return new GameObject[0];
+	}
+}

src/awlex/ospu/polymover/PolyMover.java

@@ -6,7 +6,7 @@ import itdelatrisu.opsu.objects.GameObject;
  * Created by Awlex on 18.11.2016.
  */
 public abstract class PolyMover {
-	public abstract double[] getPoint(int time);
+	public abstract double[] getPointAt(int time);
 	
 	public abstract GameObject[] getItems();
 }

src/awlex/ospu/polymover/factory/ArcFactory.java

@@ -1,25 +1,26 @@
 package awlex.ospu.polymover.factory;
 
-import awlex.ospu.polymover.Arc;
+import awlex.ospu.polymover.ArcMover;
+import awlex.ospu.polymover.LineMover;
 import awlex.ospu.polymover.PolyMover;
 import itdelatrisu.opsu.objects.GameObject;
 
 /**
  * Created by Awlex on 18.11.2016.
  */
-public class ArcFactory implements MultiMoverFactory {
+public class ArcFactory implements PolyMoverFactory {
 	
 	private static final int PREFFERED_BUFFER_SIZE = 3;
-	private PolyMover arc1, arc2;
+	private PolyMover current, previous;
+	private int lastIndex;
 	
-	@Override
-	public double[] getPoint(int time) {
-		if (arc2 == null) {
-			return arc1.getPoint(time);
+	public double[] getPointAt(int time) {
+		if (previous == null) {
+			return current.getPointAt(time);
 		}
 		
-		double[] point1 = arc1.getPoint(time);
-		double[] point2 = arc2.getPoint(time);
+		double[] point1 = current.getPointAt(time);
+		double[] point2 = previous.getPointAt(time);
 		
 		return new double[]{
 			(point1[0] + point2[0]) * 0.5,
@@ -31,15 +32,26 @@ public class ArcFactory implements MultiMoverFactory {
 	public void init(GameObject[] objects, int startIndex) {
 		if (objects == null)
 			throw new NullPointerException("Objects musn't be null");
-		if (objects.length < startIndex + 2)
-		arc1 = new Arc(objects[startIndex], objects[startIndex + 1], objects[startIndex + 2]);
-		arc2 = null;
+		
+		GameObject middle = objects[startIndex + 1];
+		if (middle.isSlider() || middle.isSpinner() || !ArcMover.canCricleExistBetweenItems(objects[startIndex], middle, objects[startIndex + 2]))
+			current = new LineMover(objects, startIndex, 3);
+		else
+			current = new ArcMover(objects[startIndex], middle, objects[startIndex + 2]);
+		lastIndex = startIndex + 2;
+		previous = null;
 	}
 	
 	public void update(GameObject p) {
-		if (arc2 != null)
-			arc1 = arc2;
-		arc2 = new Arc(arc1, p);
+		GameObject[] items = (previous == null ? current : previous).getItems();
+		GameObject last = items[items.length - 1];
+		if (last != p) {
+			if (ArcMover.canCricleExistBetweenItems(items[items.length - 2], items[items.length - 1], p)) {
+				previous = current;
+				current = new ArcMover(previous, p);
+			}
+		}
+		lastIndex++;
 	}
 	
 	@Override
@@ -51,4 +63,15 @@ public class ArcFactory implements MultiMoverFactory {
 	public String toString() {
 		return "Arcs";
 	}
+	
+	@Override
+	public boolean isInitialized() {
+		return current != null;
+	}
+	
+	@Override
+	public int getLatestIndex() {
+		return lastIndex;
+	}
+	
 }

src/awlex/ospu/polymover/factory/PolyMoverFactory.java

@@ -5,14 +5,13 @@ import itdelatrisu.opsu.objects.GameObject;
 /**
  * Created by Awlex on 18.11.2016.
  */
-public interface MultiMoverFactory {
-	
+public interface PolyMoverFactory {
 	
 	/**
 	 * @param time point in time whose cursor position has to be calculated
 	 * @return [x, y]
 	 */
-	double[] getPoint(int time);
+	double[] getPointAt(int time);
 	
 	void init(GameObject[] objects, int startIndex);
 	
@@ -24,4 +23,8 @@ public interface MultiMoverFactory {
 	 * @return
 	 */
 	int getPrefferedBufferSize();
+	
+	boolean isInitialized();
+	
+	int getLatestIndex();
 }