we want to dance

src/itdelatrisu/opsu/objects/Circle.java

@@ -38,7 +38,7 @@ import org.newdawn.slick.Graphics;
  */
 public class Circle extends GameObject {
 	/** The diameter of hit circles. */
-	private static float diameter;
+	public static float diameter;
 
 	/** The associated HitObject. */
 	private HitObject hitObject;

src/itdelatrisu/opsu/states/Game.java

@@ -73,6 +73,7 @@ import org.newdawn.slick.state.transition.DelayedFadeOutTransition;
 import org.newdawn.slick.state.transition.EasedFadeOutTransition;
 import org.newdawn.slick.state.transition.EmptyTransition;
 import org.newdawn.slick.state.transition.FadeInTransition;
+import yugecin.opsudance.Dancer;
 
 /**
  * "Game" state.
@@ -341,19 +342,17 @@ public class Game extends BasicGameState {
 		autoMousePosition.set(width / 2, height / 2);
 		autoMousePressed = false;
 		if (GameMod.AUTO.isActive() || GameMod.AUTOPILOT.isActive()) {
-			Vec2f autoPoint = null;
-			if (isLeadIn()) {
-				// lead-in
-				float progress = Math.max((float) (leadInTime - beatmap.audioLeadIn) / approachTime, 0f);
-				autoMousePosition.y = height / (2f - progress);
-			} else if (objectIndex == 0 && trackPosition < firstObjectTime) {
-				// before first object
-				timeDiff = firstObjectTime - trackPosition;
-				if (timeDiff < approachTime) {
-					Vec2f point = gameObjects[0].getPointAt(trackPosition);
-					autoPoint = getPointAt(autoMousePosition.x, autoMousePosition.y, point.x, point.y, 1f - ((float) timeDiff / approachTime));
+			Vec2f autoPoint;
+			if (objectIndex == 0) {
+				autoPoint = gameObjects[0].getPointAt(trackPosition);
+			} else if (objectIndex < beatmap.objects.length - 1) {
+				Dancer d = Dancer.instance;
+				d.update(trackPosition, gameObjects[objectIndex - 1], gameObjects[objectIndex]);
+				autoPoint = new Vec2f(d.x, d.y);
+				if (trackPosition < gameObjects[objectIndex].getTime()) {
+					autoMousePressed = true;
 				}
-			} else if (objectIndex < beatmap.objects.length) {
+				/*
 				// normal object
 				int objectTime = beatmap.objects[objectIndex].getTime();
 				if (trackPosition < objectTime) {
@@ -386,14 +385,14 @@ public class Game extends BasicGameState {
 					autoPoint = gameObjects[objectIndex].getPointAt(trackPosition);
 					autoMousePressed = true;
 				}
+				*/
 			} else {
 				// last object
 				autoPoint = gameObjects[objectIndex - 1].getPointAt(trackPosition);
 			}
 
 			// set mouse coordinates
-			if (autoPoint != null)
-				autoMousePosition.set(autoPoint.x, autoPoint.y);
+			autoMousePosition.set(autoPoint.x, autoPoint.y);
 		}
 
 		// "flashlight" mod: restricted view of hit objects around cursor
@@ -1139,6 +1138,8 @@ public class Game extends BasicGameState {
 		if (beatmap == null || beatmap.objects == null)
 			throw new RuntimeException("Running game with no beatmap loaded.");
 
+		Dancer.instance.init(beatmap.getTitle());
+
 		// free all previously cached hitobject to framebuffer mappings if some still exist
 		FrameBufferCache.getInstance().freeMap();
 
@@ -1217,7 +1218,6 @@ public class Game extends BasicGameState {
 							hitObject.getTypeName(), i, hitObject.toString()), e, true);
 					gameObjects[i] = new DummyObject(hitObject);
 				}
-				gameObjects[i].updateStartEndPositions(hitObjectTime);
 			}
 
 			// stack calculations
@@ -1267,6 +1267,10 @@ public class Game extends BasicGameState {
 				replayFrames.add(new ReplayFrame(0, 0, input.getMouseX(), input.getMouseY(), 0));
 			}
 
+			for (int i = 0; i < gameObjects.length; i++) {
+				gameObjects[i].updateStartEndPositions(beatmap.objects[i].getTime());
+			}
+
 			leadInTime = beatmap.audioLeadIn + approachTime;
 			restart = Restart.FALSE;
 
@@ -1756,22 +1760,6 @@ public class Game extends BasicGameState {
 		return frame;
 	}
 
-	/**
-	 * Returns the point at the t value between a start and end point.
-	 * @param startX the starting x coordinate
-	 * @param startY the starting y coordinate
-	 * @param endX the ending x coordinate
-	 * @param endY the ending y coordinate
-	 * @param t the t value [0, 1]
-	 * @return the position vector
-	 */
-	private Vec2f getPointAt(float startX, float startY, float endX, float endY, float t) {
-		// "autopilot" mod: move quicker between objects
-		if (GameMod.AUTOPILOT.isActive())
-			t = Utils.clamp(t * 2f, 0f, 1f);
-		return new Vec2f(startX + (endX - startX) * t, startY + (endY - startY) * t);
-	}
-
 	/**
 	 * Updates the current visible area radius (if the "flashlight" mod is enabled).
 	 * @param delta the delta interval