Minor graphical updates and code cleaning.

- Padded game score display, and always display 2 digits in front of the decimal (e.g. 00.00% instead of 0.00%).
- Keep map progress circle at a fixed location instead of basing it off the score length.
- Moved some track resets (pause + restart at preview) to trigger upon loading the song menu.  Fixes weird behaviors when leaving the game state.
- Cleaned up trailing whitespace and added missing overrides.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-01-16 15:44:13 -05:00
parent be1ec64f28
commit 31a97fbc5d
19 changed files with 95 additions and 60 deletions

View File

@@ -71,7 +71,7 @@ public class Spinner implements HitObject {
/**
* Initializes the Spinner data type with images and dimensions.
* @param container the game container
* @throws SlickException
* @throws SlickException
*/
public static void init(GameContainer container) throws SlickException {
width = container.getWidth();
@@ -99,6 +99,7 @@ public class Spinner implements HitObject {
rotationsNeeded = spinsPerMinute * (hitObject.getEndTime() - hitObject.getTime()) / 60000f;
}
@Override
public void draw(int trackPosition, boolean currentObject, Graphics g) {
// only draw spinners if current object
if (!currentObject)
@@ -139,7 +140,7 @@ public class Spinner implements HitObject {
score.drawSymbolNumber(extraRotations * 1000, width / 2, height * 2 / 3, 1.0f);
}
}
/**
* Calculates and sends the spinner hit result.
* @return the hit result (GameScore.HIT_* constants)
@@ -165,9 +166,10 @@ public class Spinner implements HitObject {
return result;
}
// not used
public boolean mousePressed(int x, int y) { return false; }
@Override
public boolean mousePressed(int x, int y) { return false; } // not used
@Override
public boolean update(boolean overlap, int delta, int mouseX, int mouseY) {
int trackPosition = MusicController.getPosition();
if (overlap)