From 03be29307f06ddd1c1797db78dee9e0735629935 Mon Sep 17 00:00:00 2001
From: Jeffrey Han <itdelatrisu@gmail.com>
Date: Wed, 2 Jul 2014 23:38:30 -0400
Subject: [PATCH] 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 <itdelatrisu@gmail.com>
---
 res/reversearrow.png                      | Bin 4853 -> 6958 bytes
 src/itdelatrisu/opsu/MusicController.java |   6 +--
 src/itdelatrisu/opsu/Opsu.java            |  16 ++++----
 src/itdelatrisu/opsu/objects/Slider.java  |  46 +++++++++++++++++-----
 src/itdelatrisu/opsu/states/Game.java     |  37 ++++++++---------
 src/itdelatrisu/opsu/states/MainMenu.java |   2 +
 src/itdelatrisu/opsu/states/Options.java  |  10 +----
 src/itdelatrisu/opsu/states/SongMenu.java |   8 ++--
 8 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/res/reversearrow.png b/res/reversearrow.png
index 7ebdec37d356490d018f711ae525abb3250be3fd..f88117cadea6fa9f87526d96a5d2a2ad38e62a41 100644
GIT binary patch
literal 6958
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
AivR!s

literal 4853
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
K&U<aAnEwHrcQ(ZU

diff --git a/src/itdelatrisu/opsu/MusicController.java b/src/itdelatrisu/opsu/MusicController.java
index 62f8e21a..91b26643 100644
--- a/src/itdelatrisu/opsu/MusicController.java
+++ b/src/itdelatrisu/opsu/MusicController.java
@@ -68,9 +68,9 @@ public class 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())
diff --git a/src/itdelatrisu/opsu/Opsu.java b/src/itdelatrisu/opsu/Opsu.java
index 32b12e39..0aedf827 100644
--- a/src/itdelatrisu/opsu/Opsu.java
+++ b/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 class Opsu extends StateBasedGame {
 
 	@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) {
diff --git a/src/itdelatrisu/opsu/objects/Slider.java b/src/itdelatrisu/opsu/objects/Slider.java
index 6a110483..5ad9cc2b 100644
--- a/src/itdelatrisu/opsu/objects/Slider.java
+++ b/src/itdelatrisu/opsu/objects/Slider.java
@@ -151,12 +151,17 @@ public class Slider {
 		 */
 		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 class Slider {
 				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 class Slider {
 		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 @@ public class Slider {
 			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 class Slider {
 		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 class Slider {
 
 		// 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) {
diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
index 655ff2e2..cc9000c7 100644
--- a/src/itdelatrisu/opsu/states/Game.java
+++ b/src/itdelatrisu/opsu/states/Game.java
@@ -322,23 +322,22 @@ public class Game extends BasicGameState {
 		// 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 class Game extends BasicGameState {
 		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;
diff --git a/src/itdelatrisu/opsu/states/MainMenu.java b/src/itdelatrisu/opsu/states/MainMenu.java
index 8eac1291..66375dc4 100644
--- a/src/itdelatrisu/opsu/states/MainMenu.java
+++ b/src/itdelatrisu/opsu/states/MainMenu.java
@@ -111,6 +111,8 @@ public class MainMenu extends BasicGameState {
 	@Override
 	public void init(GameContainer container, StateBasedGame game)
 			throws SlickException {
+		Utils.init(container, game);
+
 		this.game = game;
 
 		osuStartTime = System.currentTimeMillis();
diff --git a/src/itdelatrisu/opsu/states/Options.java b/src/itdelatrisu/opsu/states/Options.java
index e88b7e4c..3bc9b7c0 100644
--- a/src/itdelatrisu/opsu/states/Options.java
+++ b/src/itdelatrisu/opsu/states/Options.java
@@ -315,7 +315,6 @@ public class Options extends BasicGameState {
 	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 class Options extends BasicGameState {
 		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 class Options extends BasicGameState {
 		);
 		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 class Options extends BasicGameState {
 	@Override
 	public void update(GameContainer container, StateBasedGame game, int delta)
 			throws SlickException {
-		init = true;
+		// empty
 	}
 
 	@Override
diff --git a/src/itdelatrisu/opsu/states/SongMenu.java b/src/itdelatrisu/opsu/states/SongMenu.java
index c5b855bb..6427cf5e 100644
--- a/src/itdelatrisu/opsu/states/SongMenu.java
+++ b/src/itdelatrisu/opsu/states/SongMenu.java
@@ -363,6 +363,7 @@ public class SongMenu extends BasicGameState {
 			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 class SongMenu extends BasicGameState {
 
 					} 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 class SongMenu extends BasicGameState {
 			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 class SongMenu extends BasicGameState {
 	 * 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);