Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor scorebar updates.

Browse Source 
- Support loading scorebar-bg animations.
- Slight changes to scaling and positioning of scorebar-bg.  This still isn't quite correct (TODO).

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-01-25 18:36:54 -05:00
parent 0c1b86de62
commit ef9e38bf2d
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/itdelatrisu/opsu/GameImage.java
View File

@ -169,13 +169,13 @@ public enum GameImage {
SCOREBAR_BG ("scorebar-bg", "png") { SCOREBAR_BG ("scorebar-bg", "png") {
@Override @Override
protected Image process_sub(Image img, int w, int h) { protected Image process_sub(Image img, int w, int h) {
return img.getScaledCopy(w / 2, img.getHeight()); return img.getScaledCopy((w * 0.565f) / img.getWidth());
} }
}, },
SCOREBAR_COLOUR ("scorebar-colour", "png") { SCOREBAR_COLOUR ("scorebar-colour", "scorebar-colour-%d", "png") {
@Override @Override
protected Image process_sub(Image img, int w, int h) { protected Image process_sub(Image img, int w, int h) {
return img.getScaledCopy(w / 2, img.getHeight()); return img.getScaledCopy((w * 0.521f) / img.getWidth());
} }
}, },
SCOREBAR_KI ("scorebar-ki", "png"), SCOREBAR_KI ("scorebar-ki", "png"),

22
src/itdelatrisu/opsu/GameScore.java
View File

@ -28,6 +28,7 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import org.newdawn.slick.Animation;
import org.newdawn.slick.Color; import org.newdawn.slick.Color;
import org.newdawn.slick.Graphics; import org.newdawn.slick.Graphics;
import org.newdawn.slick.Image; import org.newdawn.slick.Image;
@ -190,6 +191,9 @@ public class GameScore {
/** Score text symbol images. */ /** Score text symbol images. */
private HashMap<Character, Image> scoreSymbols; private HashMap<Character, Image> scoreSymbols;
/** Scorebar animation. */
private Animation scorebarColour;
/** Container dimensions. */ /** Container dimensions. */
private int width, height; private int width, height;
@ -235,6 +239,10 @@ public class GameScore {
else else
comboBurstImages = new Image[]{ GameImage.COMBO_BURST.getImage() }; comboBurstImages = new Image[]{ GameImage.COMBO_BURST.getImage() };
// scorebar-colour animation
Image[] scorebar = GameImage.SCOREBAR_COLOUR.getImages();
scorebarColour = (scorebar != null) ? new Animation(scorebar, 60) : null;
// default symbol images // default symbol images
defaultSymbols = new Image[10]; defaultSymbols = new Image[10];
defaultSymbols[0] = GameImage.DEFAULT_0.getImage(); defaultSymbols[0] = GameImage.DEFAULT_0.getImage();
@ -415,15 +423,21 @@ public class GameScore {
if (!breakPeriod) { if (!breakPeriod) {
// scorebar // scorebar
// TODO: these might need to be scaled by cropping the empty (transparent) space around the images...
float healthRatio = healthDisplay / 100f; float healthRatio = healthDisplay / 100f;
if (firstObject) { // gradually move ki before map begins if (firstObject) { // gradually move ki before map begins
if (firstObjectTime >= 1500 && trackPosition < firstObjectTime - 500) if (firstObjectTime >= 1500 && trackPosition < firstObjectTime - 500)
healthRatio = (float) trackPosition / (firstObjectTime - 500); healthRatio = (float) trackPosition / (firstObjectTime - 500);
} }
GameImage.SCOREBAR_BG.getImage().draw(0, 0); Image scorebar = GameImage.SCOREBAR_BG.getImage();
Image colour = GameImage.SCOREBAR_COLOUR.getImage(); Image colour = (scorebarColour != null) ?
scorebarColour.getCurrentFrame() :
GameImage.SCOREBAR_COLOUR.getImage();
float colourX = scorebar.getWidth() * 0.017f, colourY = scorebar.getHeight() * 0.3f;
scorebar.draw(0, 0);
Image colourCropped = colour.getSubImage(0, 0, (int) (colour.getWidth() * healthRatio), colour.getHeight()); Image colourCropped = colour.getSubImage(0, 0, (int) (colour.getWidth() * healthRatio), colour.getHeight());
colourCropped.draw(0, GameImage.SCOREBAR_BG.getImage().getHeight() / 4f); colourCropped.draw(colourX, colourY);
Image ki = null; Image ki = null;
if (health >= 50f) if (health >= 50f)
ki = GameImage.SCOREBAR_KI.getImage(); ki = GameImage.SCOREBAR_KI.getImage();
@ -431,7 +445,7 @@ public class GameScore {
ki = GameImage.SCOREBAR_KI_DANGER.getImage(); ki = GameImage.SCOREBAR_KI_DANGER.getImage();
else else
ki = GameImage.SCOREBAR_KI_DANGER2.getImage(); ki = GameImage.SCOREBAR_KI_DANGER2.getImage();
ki.drawCentered(colourCropped.getWidth(), ki.getHeight() / 2f); ki.drawCentered(colourX + colourCropped.getWidth(), ki.getHeight() / 2f);
// combo burst // combo burst
if (comboBurstIndex != -1 && comboBurstAlpha > 0f) { if (comboBurstIndex != -1 && comboBurstAlpha > 0f) {