From 0c7fa96ae305b90bf50890f33c800c143f25f19f Mon Sep 17 00:00:00 2001
From: yugecin <yugecin@users.noreply.github.com>
Date: Sat, 1 Oct 2016 11:14:15 +0200
Subject: [PATCH] add donutspinner, fix circlespinner

---
 src/yugecin/opsudance/Dancer.java             |  1 +
 .../opsudance/spinners/CircleSpinner.java     |  4 +-
 .../opsudance/spinners/DonutSpinner.java      | 52 +++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 src/yugecin/opsudance/spinners/DonutSpinner.java

diff --git a/src/yugecin/opsudance/Dancer.java b/src/yugecin/opsudance/Dancer.java
index fff9fb75..679d2d91 100644
--- a/src/yugecin/opsudance/Dancer.java
+++ b/src/yugecin/opsudance/Dancer.java
@@ -45,6 +45,7 @@ public class Dancer {
 		new RektSpinner(),
 		new BeamSpinner(),
 		new CircleSpinner(),
+		new DonutSpinner(),
 		new CubeSpinner(),
 		new HalfCircleSpinner(),
 		new IlluminatiSpinner(),
diff --git a/src/yugecin/opsudance/spinners/CircleSpinner.java b/src/yugecin/opsudance/spinners/CircleSpinner.java
index 61200314..f6b10557 100644
--- a/src/yugecin/opsudance/spinners/CircleSpinner.java
+++ b/src/yugecin/opsudance/spinners/CircleSpinner.java
@@ -38,8 +38,8 @@ public class CircleSpinner extends Spinner {
 
 		double rad = Options.width / 4.0f;
 
-		point[0] = Options.width / 2.0f + rad * Math.sin(ang);
-		point[1] = Options.height / 2.0f - rad * Math.cos(ang);
+		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;
 	}
diff --git a/src/yugecin/opsudance/spinners/DonutSpinner.java b/src/yugecin/opsudance/spinners/DonutSpinner.java
new file mode 100644
index 00000000..2d8f1759
--- /dev/null
+++ b/src/yugecin/opsudance/spinners/DonutSpinner.java
@@ -0,0 +1,52 @@
+/*
+ * 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 DonutSpinner extends Spinner {
+
+	private int ang = 0;
+
+	private double[] point = new double[2];
+
+	@Override
+	public void init()
+	{
+		ang = 0;
+	}
+
+	@Override
+	public double[] getPoint()
+	{
+		ang += 15;
+
+		double rad = Options.width / 4.0f;
+
+		point[0] = Options.width / 2.0f + rad * Math.sin(ang);
+		point[1] = Options.height / 2.0f - rad * Math.cos(ang);
+
+		return point;
+	}
+
+	@Override
+	public String toString() {
+		return "Donut";
+	}
+
+}