Misc. bug fixes and improvements.

- Fixed Game not loading OsuFile for maps in a song group. (blame: 5612336)
- Implemented rotations for reverse arrows, and added a new one by Alic1a.
- "Auto" mod: pausing no longer requires click to unpause, and mod images are permanently drawn.
- Program now loads from Main Menu instead of Options (unnecessary complications for the sake of a transition).

Signed-off-by: Jeffrey Han <[email protected]>

src/itdelatrisu/opsu/MusicController.java

@@ -68,9 +68,9 @@ private MusicController() {}
 	 */
 	@SuppressWarnings("deprecation")
 	public static void play(final OsuFile osu, final boolean loop) {
-		if (lastOsu == null || !osu.audioFilename.equals(lastOsu.audioFilename)) {
-			lastOsu = osu;
-
+		boolean play = (lastOsu == null || !osu.audioFilename.equals(lastOsu.audioFilename));
+		lastOsu = osu;
+		if (play) {
 			// TODO: properly interrupt instead of using deprecated conversion.stop();
 			// interrupt the conversion
 			if (isConverting())

src/itdelatrisu/opsu/Opsu.java

@@ -61,13 +61,13 @@ public class Opsu extends StateBasedGame {
 	 * Game states.
 	 */
 	public static final int
-		STATE_OPTIONS       = 1,
-		STATE_MAINMENU      = 2,
-		STATE_MAINMENUEXIT  = 3,
-		STATE_SONGMENU      = 4,
-		STATE_GAME          = 5,
-		STATE_GAMEPAUSEMENU = 6,
-		STATE_GAMERANKING   = 7;
+		STATE_MAINMENU      = 1,
+		STATE_MAINMENUEXIT  = 2,
+		STATE_SONGMENU      = 3,
+		STATE_GAME          = 4,
+		STATE_GAMEPAUSEMENU = 5,
+		STATE_GAMERANKING   = 6,
+		STATE_OPTIONS       = 7;
 
 	/**
 	 * Used to restrict the program to a single instance.
@@ -80,13 +80,13 @@ public Opsu(String name) {
 
 	@Override
 	public void initStatesList(GameContainer container) throws SlickException {
-		addState(new Options(STATE_OPTIONS));
 		addState(new MainMenu(STATE_MAINMENU));
 		addState(new MainMenuExit(STATE_MAINMENUEXIT));
 		addState(new SongMenu(STATE_SONGMENU));
 		addState(new Game(STATE_GAME));
 		addState(new GamePauseMenu(STATE_GAMEPAUSEMENU));
 		addState(new GameRanking(STATE_GAMERANKING));
+		addState(new Options(STATE_OPTIONS));
 	}
 
 	public static void main(String[] args) {

src/itdelatrisu/opsu/objects/Slider.java

@@ -151,12 +151,17 @@ private class Bezier {
 		 */
 		private float[] curveX, curveY;
 
+		/**
+		 * The angles of the first and last control points.
+		 */
+		private float startAngle, endAngle;
+
 		/**
 		 * Constructor.
 		 */
-		public Bezier(float length) {
+		public Bezier() {
 			this.order = hitObject.sliderX.length + 1;
-			this.step = 5 / length;
+			this.step = 5 / hitObject.pixelLength;
 
 			// calculate curve points for drawing
 			int N = (int) (1 / step);
@@ -168,6 +173,16 @@ public Bezier(float length) {
 				curveX[i] = c[0];
 				curveY[i] = c[1];
 			}
+
+			// calculate angles (if needed)
+			if (hitObject.repeat > 1) {
+				float[] c1 = pointAt(0f);
+				float[] c2 = pointAt(0.01f);
+				startAngle = (float) (Math.atan2(c2[1] - c1[1], c2[0] - c1[0]) * 180 / Math.PI);
+				c1 = pointAt(1f);
+				c2 = pointAt(0.99f);
+				endAngle = (float) (Math.atan2(c2[1] - c1[1], c2[0] - c1[0]) * 180 / Math.PI);
+			}
 		}
 
 		/**
@@ -176,21 +191,31 @@ public Bezier(float length) {
 		private float getX(int i) {
 			return (i == 0) ? hitObject.x : hitObject.sliderX[i - 1];
 		}
-	
+
 		/**
 		 * Returns the y coordinate of the control point at index i.
 		 */
 		private float getY(int i) {
 			return (i == 0) ? hitObject.y : hitObject.sliderY[i - 1];
 		}
-
+
+		/**
+		 * Returns the angle of the first control point.
+		 */
+		private float getStartAngle() { return startAngle; }
+
+		/**
+		 * Returns the angle of the last control point.
+		 */
+		private float getEndAngle() { return endAngle; }
+
 		/**
 		 * Calculates the factorial of a number.
 		 */
 		private long factorial(int n) {
 			return (n <= 1 || n > 20) ? 1 : n * factorial(n - 1);
 		}
-	
+
 		/**
 		 * Calculates the Bernstein polynomial.
 		 * @param i the index
@@ -201,7 +226,7 @@ private double bernstein(int i, int n, float t) {
 			return factorial(n) / (factorial(i) * factorial(n-i)) *
 					Math.pow(t, i) * Math.pow(1-t, n-i);
 		}
-	
+
 		/**
 		 * Returns the point on the Bezier curve at a value t.
 		 * For curves of order greater than 4, points will be generated along
@@ -284,7 +309,7 @@ public Slider(OsuHitObject hitObject, Game game, GameScore score, Color color, b
 		this.color = color;
 		this.comboEnd = comboEnd;
 
-		this.bezier = new Bezier(hitObject.pixelLength);
+		this.bezier = new Bezier();
 
 		// calculate slider time and ticks upon first update call
 	}
@@ -327,10 +352,13 @@ public void draw(int trackPosition, boolean currentObject) {
 
 		// repeats
 		if (hitObject.repeat - 1 > currentRepeats) {
-			if (currentRepeats % 2 == 0)  // last circle
+			if (currentRepeats % 2 == 0) {  // last circle
+				reverseArrow.setRotation(bezier.getEndAngle());
 				reverseArrow.drawCentered(hitObject.sliderX[lastIndex], hitObject.sliderY[lastIndex]);
-			else  // first circle
+			} else {  // first circle
+				reverseArrow.setRotation(bezier.getStartAngle());
 				reverseArrow.drawCentered(hitObject.x, hitObject.y);
+			}
 		}
 
 		if (timeDiff >= 0) {

src/itdelatrisu/opsu/states/Game.java

@@ -322,23 +322,22 @@ public void render(GameContainer container, StateBasedGame game, Graphics g)
 		// game elements
 		score.drawGameElements(g, mapLength, false, objectIndex == 0);
 
-		// first object...
-		if (objectIndex == 0) {
-			// skip beginning
-			if (osu.objects[objectIndex].time - skipOffsetTime > 5000 &&
-				trackPosition < osu.objects[objectIndex].time - skipOffsetTime)
-				skipButton.draw();
-
-			// mod icons
-			if (trackPosition < osu.objects[objectIndex].time) {
-				for (int i = Options.MOD_MAX - 1; i >= 0; i--) {
-					if (Options.isModActive(i)) {
-						Image modImage = Options.getModImage(i);
-						modImage.draw(
-								(width * 0.85f) + ((i - (Options.MOD_MAX / 2)) * modImage.getWidth() / 3f),
-								height / 10f
-						);
-					}
+		// skip beginning
+		if (objectIndex == 0 &&
+			osu.objects[0].time - skipOffsetTime > 5000 &&
+			trackPosition < osu.objects[0].time - skipOffsetTime)
+			skipButton.draw();
+
+		// mod icons
+		if ((objectIndex == 0 && trackPosition < osu.objects[0].time) ||
+			Options.isModActive(Options.MOD_AUTO)) {
+			for (int i = Options.MOD_MAX - 1; i >= 0; i--) {
+				if (Options.isModActive(i)) {
+					Image modImage = Options.getModImage(i);
+					modImage.draw(
+							(width * 0.85f) + ((i - (Options.MOD_MAX / 2)) * modImage.getWidth() / 3f),
+							height / 10f
+					);
 				}
 			}
 		}
@@ -570,7 +569,9 @@ public void keyPressed(int key, char c) {
 		case Input.KEY_ESCAPE:
 			// pause game
 			int trackPosition = MusicController.getPosition();
-			if (pauseTime < 0 && breakTime <= 0 && trackPosition >= osu.objects[0].time) {
+			if (pauseTime < 0 && breakTime <= 0 &&
+				trackPosition >= osu.objects[0].time &&
+				!Options.isModActive(Options.MOD_AUTO)) {
 				pausedMouseX = input.getMouseX();
 				pausedMouseY = input.getMouseY();
 				pausePulse = 0f;

src/itdelatrisu/opsu/states/MainMenu.java

@@ -111,6 +111,8 @@ public MainMenu(int state) {
 	@Override
 	public void init(GameContainer container, StateBasedGame game)
 			throws SlickException {
+		Utils.init(container, game);
+
 		this.game = game;
 
 		osuStartTime = System.currentTimeMillis();

src/itdelatrisu/opsu/states/Options.java

@@ -315,7 +315,6 @@ private enum GameOption {
 	private Input input;
 	private Graphics g;
 	private int state;
-	private boolean init = false;
 
 	public Options(int state) {
 		this.state = state;
@@ -329,8 +328,6 @@ public void init(GameContainer container, StateBasedGame game)
 		this.input = container.getInput();
 		this.g = container.getGraphics();
 
-		Utils.init(container, game);
-
 		int width = container.getWidth();
 		int height = container.getHeight();
 
@@ -376,16 +373,11 @@ public void init(GameContainer container, StateBasedGame game)
 		);
 		for (int i = 0; i < modButtons.length; i++)
 			modButtons[i].getImage().setAlpha(0.5f);
-
-		game.enterState(Opsu.STATE_MAINMENU, new EmptyTransition(), new FadeInTransition(Color.black));
 	}
 
 	@Override
 	public void render(GameContainer container, StateBasedGame game, Graphics g)
 			throws SlickException {
-		if (!init)
-			return;
-
 		g.setBackground(Utils.COLOR_BLACK_ALPHA);
 		g.setColor(Color.white);
 
@@ -449,7 +441,7 @@ public void render(GameContainer container, StateBasedGame game, Graphics g)
 	@Override
 	public void update(GameContainer container, StateBasedGame game, int delta)
 			throws SlickException {
-		init = true;
+		// empty
 	}
 
 	@Override

src/itdelatrisu/opsu/states/SongMenu.java

@@ -363,6 +363,7 @@ public void mousePressed(int button, int x, int y) {
 			if (sortTabs[i].contains(x, y)) {
 				if (i != currentSort) {
 					currentSort = i;
+					SoundController.playSound(SoundController.SOUND_MENUCLICK);
 					OsuGroupNode oldFocusBase = Opsu.groups.getBaseNode(focusNode.index);
 					int oldFocusFileIndex = focusNode.osuFileIndex;
 					focusNode = null;
@@ -395,7 +396,7 @@ public void mousePressed(int button, int x, int y) {
 
 					} else if (node.osuFileIndex == focusNode.osuFileIndex) {
 						// if already focused, load the beatmap
-						startGame(focusNode.osuFiles.get(focusNode.osuFileIndex));
+						startGame();
 
 					} else {
 						// focus the node
@@ -443,7 +444,7 @@ public void keyPressed(int key, char c) {
 			break;
 		case Input.KEY_ENTER:
 			if (focusNode != null)
-				startGame(focusNode.osuFiles.get(focusNode.osuFileIndex));
+				startGame();
 			break;
 		case Input.KEY_DOWN:
 			changeIndex(1);
@@ -595,11 +596,12 @@ public OsuGroupNode setFocus(OsuGroupNode node, int pos, boolean flag) {
 	 * Starts the game.
 	 * @param osu the OsuFile to send to the game
 	 */
-	private void startGame(OsuFile osu) {
+	private void startGame() {
 		if (MusicController.isConverting())
 			return;
 
 		SoundController.playSound(SoundController.SOUND_MENUHIT);
+		OsuFile osu = MusicController.getOsuFile();
 		Display.setTitle(String.format("%s - %s", game.getTitle(), osu.toString()));
 		OsuParser.parseHitObjects(osu);
 		SoundController.setSampleSet(osu.sampleSet);