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

Moved hit result to be drawn after lighting

Browse Source
This commit is contained in:
Drew Lemmy 2015-04-06 23:12:36 +01:00
parent 87e68bd494
commit 9a2772b614
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -826,11 +826,6 @@ public class GameData {
while (iter.hasNext()) { while (iter.hasNext()) {
OsuHitObjectResult hitResult = iter.next(); OsuHitObjectResult hitResult = iter.next();
if (hitResult.time + HITRESULT_FADE_TIME > trackPosition) { if (hitResult.time + HITRESULT_FADE_TIME > trackPosition) {
// hit result
hitResults[hitResult.result].setAlpha(hitResult.alpha);
hitResults[hitResult.result].drawCentered(hitResult.x, hitResult.y);
hitResults[hitResult.result].setAlpha(1f);
// spinner // spinner
if (hitResult.isSpinner && hitResult.result != HIT_MISS) { if (hitResult.isSpinner && hitResult.result != HIT_MISS) {
Image spinnerOsu = GameImage.SPINNER_OSU.getImage(); Image spinnerOsu = GameImage.SPINNER_OSU.getImage();
@ -848,6 +843,11 @@ public class GameData {
lighting.drawCentered(hitResult.x, hitResult.y, hitResult.color); lighting.drawCentered(hitResult.x, hitResult.y, hitResult.color);
} }
// hit result
hitResults[hitResult.result].setAlpha(hitResult.alpha);
hitResults[hitResult.result].drawCentered(hitResult.x, hitResult.y);
hitResults[hitResult.result].setAlpha(1f);
// hit animation // hit animation
Image scaledHitCircle = GameImage.HITCIRCLE.getImage().getScaledCopy( Image scaledHitCircle = GameImage.HITCIRCLE.getImage().getScaledCopy(
1f + (((float)(trackPosition - hitResult.time) / HITCIRCLE_FADE_TIME) / 2)); 1f + (((float)(trackPosition - hitResult.time) / HITCIRCLE_FADE_TIME) / 2));