ApproachCircleSpinner. close #12

src/yugecin/opsudance/Dancer.java

@@ -52,6 +52,7 @@ public class Dancer {
 		new IlluminatiSpinner(),
 		new LessThanThreeSpinner(),
 		new RektCircleSpinner(),
+		new ApproachCircleSpinner(),
 	};
 
 	public static Dancer instance = new Dancer();
@@ -165,6 +166,7 @@ public class Dancer {
 			}
 		} else {
 			if (c.isSpinner()) {
+				Spinner.PROGRESS = (double) (time - c.getTime()) / (double) (c.getEndTime() - c.getTime());
 				double[] point = spinner.getPoint();
 				x = (float) point[0];
 				y = (float) point[1];

src/yugecin/opsudance/spinners/ApproachCircleSpinner.java

@@ -0,0 +1,54 @@
+/*
+ * opsu!dance - fork of opsu! with cursordance auto
+ * Copyright (C) 2016 yugecin
+ *
+ * opsu!dance is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * opsu!dance is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with opsu!dance.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package yugecin.opsudance.spinners;
+
+import itdelatrisu.opsu.Options;
+
+public class ApproachCircleSpinner extends Spinner {
+
+	private int ang = 0;
+
+	private double[] point = new double[2];
+
+	@Override
+	public void init()
+	{
+		ang = 0;
+	}
+
+	@Override
+	public double[] getPoint()
+	{
+		if (waitForDelay()) {
+			ang += 15;
+		}
+
+		double rad = Options.width / 4.0f * (1d - Spinner.PROGRESS);
+
+		point[0] = Options.width / 2.0f + rad * Math.sin(ang / 180d * Math.PI);
+		point[1] = Options.height / 2.0f - rad * Math.cos(ang / 180d * Math.PI);
+
+		return point;
+	}
+
+	@Override
+	public String toString() {
+		return "Approachcircle";
+	}
+
+}

src/yugecin/opsudance/spinners/Spinner.java

@@ -24,6 +24,7 @@ public abstract class Spinner {
 	private int index;
 	private static int delay;
 	public static int DELAY = 3;
+	public static double PROGRESS;
 
 	public abstract void init();