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

Minor follow-up to #48.

Browse Source 
Created some more variables for readability.

Removed some unnecessary casts.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-03-12 23:53:25 -04:00
parent 466312bc45
commit 35b1bf197f
5 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/itdelatrisu/opsu/GameData.java
View File

@@ -534,6 +534,7 @@ public class GameData {
public void drawGameElements(Graphics g, boolean breakPeriod, boolean firstObject) { public void drawGameElements(Graphics g, boolean breakPeriod, boolean firstObject) {
boolean relaxAutoPilot = (GameMod.RELAX.isActive() || GameMod.AUTOPILOT.isActive()); boolean relaxAutoPilot = (GameMod.RELAX.isActive() || GameMod.AUTOPILOT.isActive());
int margin = (int) (width * 0.008f); int margin = (int) (width * 0.008f);
float uiScale = GameImage.getUIscale();
// score // score
if (!relaxAutoPilot) if (!relaxAutoPilot)
@@ -602,46 +603,43 @@ public class GameData {
hitErrorAlpha = (HIT_ERROR_FADE_TIME - (trackPosition - hitErrorList.getFirst().time)) / (HIT_ERROR_FADE_TIME * 0.1f); hitErrorAlpha = (HIT_ERROR_FADE_TIME - (trackPosition - hitErrorList.getFirst().time)) / (HIT_ERROR_FADE_TIME * 0.1f);
// draw bar // draw bar
float hitErrorY = height/GameImage.getUIscale() - margin - 10, hitErrorX = width/GameImage.getUIscale() / 2; float hitErrorX = width / uiScale / 2;
float hitErrorY = height / uiScale - margin - 10;
float barY = (hitErrorY - 3) * uiScale, barHeight = 6 * uiScale;
float tickY = (hitErrorY - 10) * uiScale, tickHeight = 20 * uiScale;
float oldAlphaBlack = Utils.COLOR_BLACK_ALPHA.a; float oldAlphaBlack = Utils.COLOR_BLACK_ALPHA.a;
Utils.COLOR_BLACK_ALPHA.a = hitErrorAlpha; Utils.COLOR_BLACK_ALPHA.a = hitErrorAlpha;
g.setColor(Utils.COLOR_BLACK_ALPHA); g.setColor(Utils.COLOR_BLACK_ALPHA);
g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_50] ) * GameImage.getUIscale(), g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_50]) * uiScale, tickY,
(hitErrorY - 10 ) * GameImage.getUIscale(), (hitResultOffset[HIT_50] * 2) * uiScale, tickHeight);
(hitResultOffset[HIT_50] * 2 ) * GameImage.getUIscale(), 20 * GameImage.getUIscale());
Utils.COLOR_BLACK_ALPHA.a = oldAlphaBlack; Utils.COLOR_BLACK_ALPHA.a = oldAlphaBlack;
Utils.COLOR_LIGHT_ORANGE.a = hitErrorAlpha; Utils.COLOR_LIGHT_ORANGE.a = hitErrorAlpha;
g.setColor(Utils.COLOR_LIGHT_ORANGE); g.setColor(Utils.COLOR_LIGHT_ORANGE);
g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_50]) * GameImage.getUIscale(), g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_50]) * uiScale, barY,
(hitErrorY - 3) * GameImage.getUIscale(), (hitResultOffset[HIT_50] * 2) * uiScale, barHeight);
(hitResultOffset[HIT_50] * 2) * GameImage.getUIscale(), 6 * GameImage.getUIscale());
Utils.COLOR_LIGHT_ORANGE.a = 1f; Utils.COLOR_LIGHT_ORANGE.a = 1f;
Utils.COLOR_LIGHT_GREEN.a = hitErrorAlpha; Utils.COLOR_LIGHT_GREEN.a = hitErrorAlpha;
g.setColor(Utils.COLOR_LIGHT_GREEN); g.setColor(Utils.COLOR_LIGHT_GREEN);
g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_100]) * GameImage.getUIscale(), g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_100]) * uiScale, barY,
(hitErrorY - 3) * GameImage.getUIscale(), (hitResultOffset[HIT_100] * 2) * uiScale, barHeight);
(hitResultOffset[HIT_100] * 2) * GameImage.getUIscale(), 6 * GameImage.getUIscale());
Utils.COLOR_LIGHT_GREEN.a = 1f; Utils.COLOR_LIGHT_GREEN.a = 1f;
Utils.COLOR_LIGHT_BLUE.a = hitErrorAlpha; Utils.COLOR_LIGHT_BLUE.a = hitErrorAlpha;
g.setColor(Utils.COLOR_LIGHT_BLUE); g.setColor(Utils.COLOR_LIGHT_BLUE);
g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_300]) * GameImage.getUIscale(), g.fillRect((hitErrorX - 3 - hitResultOffset[HIT_300]) * uiScale, barY,
(hitErrorY - 3) * GameImage.getUIscale(), (hitResultOffset[HIT_300] * 2) * uiScale, barHeight);
(hitResultOffset[HIT_300] * 2) * GameImage.getUIscale(), 6 * GameImage.getUIscale());
Utils.COLOR_LIGHT_BLUE.a = 1f; Utils.COLOR_LIGHT_BLUE.a = 1f;
white.a = hitErrorAlpha; white.a = hitErrorAlpha;
g.setColor(white); g.setColor(white);
g.fillRect((hitErrorX - 1.5f) * GameImage.getUIscale(), (hitErrorY - 10) * GameImage.getUIscale(), g.fillRect((hitErrorX - 1.5f) * uiScale, tickY, 3 * uiScale, tickHeight);
3 * GameImage.getUIscale(), 20 * GameImage.getUIscale());
// draw ticks // draw ticks
float tickWidth = 2 * uiScale;
for (HitErrorInfo info : hitErrorList) { for (HitErrorInfo info : hitErrorList) {
int time = info.time; int time = info.time;
float alpha = 1 - ((float) (trackPosition - time) / HIT_ERROR_FADE_TIME); float alpha = 1 - ((float) (trackPosition - time) / HIT_ERROR_FADE_TIME);
white.a = alpha * hitErrorAlpha; white.a = alpha * hitErrorAlpha;
g.setColor(white); g.setColor(white);
g.fillRect((hitErrorX + info.timeDiff - 1) * GameImage.getUIscale(), g.fillRect((hitErrorX + info.timeDiff - 1) * uiScale, tickY, tickWidth, tickHeight);
(hitErrorY - 10) * GameImage.getUIscale(),
2 * GameImage.getUIscale(), 20 * GameImage.getUIscale());
} }
} }
@@ -659,8 +657,8 @@ public class GameData {
colour = scorebarColour.getCurrentFrame(); colour = scorebarColour.getCurrentFrame();
} else } else
colour = GameImage.SCOREBAR_COLOUR.getImage(); colour = GameImage.SCOREBAR_COLOUR.getImage();
float colourX = 4 * GameImage.getUIscale(), colourY = 15 * GameImage.getUIscale(); float colourX = 4 * uiScale, colourY = 15 * uiScale;
Image colourCropped = colour.getSubImage(0, 0, (int) (645 * GameImage.getUIscale() * healthRatio), colour.getHeight()); Image colourCropped = colour.getSubImage(0, 0, (int) (645 * uiScale * healthRatio), colour.getHeight());
scorebar.setAlpha(1f); scorebar.setAlpha(1f);
scorebar.draw(0, 0); scorebar.draw(0, 0);
@@ -716,17 +714,17 @@ public class GameData {
float scoreTextScale = 1.0f; float scoreTextScale = 1.0f;
float symbolTextScale = 1.15f; float symbolTextScale = 1.15f;
float rankResultScale = 0.5f; float rankResultScale = 0.5f;
float uiScale = GameImage.getUIscale();
// ranking panel // ranking panel
GameImage.RANKING_PANEL.getImage().draw(0, (int) (rankingHeight * GameImage.getUIscale())); GameImage.RANKING_PANEL.getImage().draw(0, (int) (rankingHeight * uiScale));
// score // score
drawFixedSizeSymbolString( drawFixedSizeSymbolString(
(score < 100000000) ? String.format("%08d", score) : Long.toString(score), (score < 100000000) ? String.format("%08d", score) : Long.toString(score),
(int) (210 * GameImage.getUIscale()), 210 * uiScale, (rankingHeight + 50) * uiScale,
(int) ((rankingHeight + 50) * GameImage.getUIscale()), scoreTextScale, getScoreSymbolImage('0').getWidth() * scoreTextScale - 2, false
scoreTextScale, );
getScoreSymbolImage('0').getWidth() * scoreTextScale - 2, false);
// result counts // result counts
float resultInitialX = 130; float resultInitialX = 130;
@@ -745,18 +743,18 @@ public class GameData {
for (int i = 0; i < rankDrawOrder.length; i += 2) { for (int i = 0; i < rankDrawOrder.length; i += 2) {
hitResults[rankDrawOrder[i]].getScaledCopy(rankResultScale).drawCentered( hitResults[rankDrawOrder[i]].getScaledCopy(rankResultScale).drawCentered(
(resultHitInitialX * GameImage.getUIscale()), resultHitInitialX * uiScale,
((resultHitInitialY + (resultOffsetY * (i / 2))) * GameImage.getUIscale())); (resultHitInitialY + (resultOffsetY * (i / 2))) * uiScale);
hitResults[rankDrawOrder[i+1]].getScaledCopy(rankResultScale).drawCentered( hitResults[rankDrawOrder[i+1]].getScaledCopy(rankResultScale).drawCentered(
((resultHitInitialX + resultOffsetX) * GameImage.getUIscale()), (resultHitInitialX + resultOffsetX) * uiScale,
((resultHitInitialY + (resultOffsetY * (i / 2))) * GameImage.getUIscale())); (resultHitInitialY + (resultOffsetY * (i / 2))) * uiScale);
drawSymbolString(String.format("%dx", rankResultOrder[i]), drawSymbolString(String.format("%dx", rankResultOrder[i]),
(int) (resultInitialX * GameImage.getUIscale()), resultInitialX * uiScale,
(int) ((resultInitialY + (resultOffsetY * (i / 2))) * GameImage.getUIscale()), (resultInitialY + (resultOffsetY * (i / 2))) * uiScale,
symbolTextScale, 1f, false); symbolTextScale, 1f, false);
drawSymbolString(String.format("%dx", rankResultOrder[i+1]), drawSymbolString(String.format("%dx", rankResultOrder[i+1]),
(int) ((resultInitialX + resultOffsetX) * GameImage.getUIscale()), (resultInitialX + resultOffsetX) * uiScale,
(int) ((resultInitialY + (resultOffsetY * (i / 2))) * GameImage.getUIscale()), (resultInitialY + (resultOffsetY * (i / 2))) * uiScale,
symbolTextScale, 1f, false); symbolTextScale, 1f, false);
} }
@@ -765,17 +763,11 @@ public class GameData {
float textY = rankingHeight + 425; float textY = rankingHeight + 425;
float numbersY = textY + 30; float numbersY = textY + 30;
drawSymbolString(String.format("%dx", comboMax), drawSymbolString(String.format("%dx", comboMax),
(int) (25 * GameImage.getUIscale()), 25 * uiScale, numbersY * uiScale, symbolTextScale, 1f, false);
(int) (numbersY * GameImage.getUIscale()), symbolTextScale, 1f, false);
drawSymbolString(String.format("%02.2f%%", getScorePercent()), drawSymbolString(String.format("%02.2f%%", getScorePercent()),
(int) ((accuracyX + 20) * GameImage.getUIscale()), (accuracyX + 20) * uiScale, numbersY * uiScale, symbolTextScale, 1f, false);
(int) (numbersY * GameImage.getUIscale()), symbolTextScale, 1f, false); GameImage.RANKING_MAXCOMBO.getImage().draw(10 * uiScale, textY * uiScale);
GameImage.RANKING_MAXCOMBO.getImage().draw( GameImage.RANKING_ACCURACY.getImage().draw(accuracyX * uiScale, textY * uiScale);
(int) (10 * GameImage.getUIscale()),
(int) (textY * GameImage.getUIscale()));
GameImage.RANKING_ACCURACY.getImage().draw(
(int) (accuracyX * GameImage.getUIscale()),
(int) (textY * GameImage.getUIscale()));
// full combo // full combo
if (comboMax == fullObjectCount) { if (comboMax == fullObjectCount) {
@@ -793,7 +785,7 @@ public class GameData {
// header // header
Image rankingTitle = GameImage.RANKING_TITLE.getImage(); Image rankingTitle = GameImage.RANKING_TITLE.getImage();
g.setColor(Utils.COLOR_BLACK_ALPHA); g.setColor(Utils.COLOR_BLACK_ALPHA);
g.fillRect(0, 0, width, 100 * GameImage.getUIscale()); g.fillRect(0, 0, width, 100 * uiScale);
rankingTitle.draw((width * 0.97f) - rankingTitle.getWidth(), 0); rankingTitle.draw((width * 0.97f) - rankingTitle.getWidth(), 0);
float c = width * 0.01f; float c = width * 0.01f;
Utils.FONT_LARGE.drawString(c, c, Utils.FONT_LARGE.drawString(c, c,

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

@@ -269,7 +269,7 @@ public enum GameImage {
return img.getScaledCopy(0.8f); return img.getScaledCopy(0.8f);
} }
}, },
MENU_PlAY ("menu-play", "png", false, false) { MENU_PLAY ("menu-play", "png", false, false) {
@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(0.8f); return img.getScaledCopy(0.8f);

2
src/itdelatrisu/opsu/Utils.java
View File

@@ -140,11 +140,11 @@ public class Utils {
container.setAlwaysRender(true); container.setAlwaysRender(true);
container.setUpdateOnlyWhenVisible(false); container.setUpdateOnlyWhenVisible(false);
// calculate UI scale
GameImage.init(width, height); GameImage.init(width, height);
// create fonts // create fonts
float fontBase = 12f * GameImage.getUIscale(); float fontBase = 12f * GameImage.getUIscale();
try { try {
Font javaFont = Font.createFont(Font.TRUETYPE_FONT, ResourceLoader.getResourceAsStream(Options.FONT_NAME)); Font javaFont = Font.createFont(Font.TRUETYPE_FONT, ResourceLoader.getResourceAsStream(Options.FONT_NAME));
Font font = javaFont.deriveFont(Font.PLAIN, (int) (fontBase * 4 / 3)); Font font = javaFont.deriveFont(Font.PLAIN, (int) (fontBase * 4 / 3));

4
src/itdelatrisu/opsu/objects/Spinner.java
View File

@@ -134,8 +134,8 @@ public class Spinner implements HitObject {
rpmImg.setAlpha(alpha); rpmImg.setAlpha(alpha);
rpmImg.drawCentered(width / 2f, height - rpmImg.getHeight() / 2f); rpmImg.drawCentered(width / 2f, height - rpmImg.getHeight() / 2f);
if (timeDiff < 0) if (timeDiff < 0)
data.drawSymbolString(Integer.toString(rpm), (int) ((width + rpmImg.getWidth() * 0.95f) / 2f), data.drawSymbolString(Integer.toString(rpm), (width + rpmImg.getWidth() * 0.95f) / 2f,
(int) (height - data.getScoreSymbolImage('0').getHeight() * 1.025f), 1f, 1f, true); height - data.getScoreSymbolImage('0').getHeight() * 1.025f, 1f, 1f, true);
// spinner meter (subimage) // spinner meter (subimage)
Image spinnerMetre = GameImage.SPINNER_METRE.getImage(); Image spinnerMetre = GameImage.SPINNER_METRE.getImage();

2
src/itdelatrisu/opsu/states/MainMenu.java
View File

@@ -133,7 +133,7 @@ public class MainMenu extends BasicGameState {
// initialize menu buttons // initialize menu buttons
Image logoImg = GameImage.MENU_LOGO.getImage(); Image logoImg = GameImage.MENU_LOGO.getImage();
Image playImg = GameImage.MENU_PlAY.getImage(); Image playImg = GameImage.MENU_PLAY.getImage();
Image exitImg = GameImage.MENU_EXIT.getImage(); Image exitImg = GameImage.MENU_EXIT.getImage();
float exitOffset = (playImg.getWidth() - exitImg.getWidth()) / 3f; float exitOffset = (playImg.getWidth() - exitImg.getWidth()) / 3f;
logo = new MenuButton(logoImg, width / 2f, height / 2f); logo = new MenuButton(logoImg, width / 2f, height / 2f);