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

don't show hitresult fades for sliders when hidden is enabled

Browse Source
This commit is contained in:
yugecin
2016-12-10 02:01:53 +01:00
parent 7a45e1abbb
commit c87c5a8d7a
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -901,20 +901,19 @@ public class GameData {
float scale = (!hitResult.expand) ? 1f : 1f + (HITCIRCLE_ANIM_SCALE - 1f) * progress; float scale = (!hitResult.expand) ? 1f : 1f + (HITCIRCLE_ANIM_SCALE - 1f) * progress;
float alpha = 1f - progress; float alpha = 1f - progress;
// slider curve if (!GameMod.HIDDEN.isActive()) {
if (hitResult.curve != null) { // slider curve
float oldWhiteAlpha = Colors.WHITE_FADE.a; if (hitResult.curve != null) {
float oldColorAlpha = hitResult.color.a; float oldWhiteAlpha = Colors.WHITE_FADE.a;
Colors.WHITE_FADE.a = alpha; float oldColorAlpha = hitResult.color.a;
hitResult.color.a = alpha; Colors.WHITE_FADE.a = alpha;
hitResult.curve.draw(hitResult.color); hitResult.color.a = alpha;
Colors.WHITE_FADE.a = oldWhiteAlpha; hitResult.curve.draw(hitResult.color);
hitResult.color.a = oldColorAlpha; Colors.WHITE_FADE.a = oldWhiteAlpha;
} hitResult.color.a = oldColorAlpha;
}
// hit circles // hit circles
if (!(hitResult.hitResultType == HitObjectType.CIRCLE && GameMod.HIDDEN.isActive())) {
// "hidden" mod: expanding animation for only circles not drawn
Image scaledHitCircle = GameImage.HITCIRCLE.getImage().getScaledCopy(scale); Image scaledHitCircle = GameImage.HITCIRCLE.getImage().getScaledCopy(scale);
Image scaledHitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage().getScaledCopy(scale); Image scaledHitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage().getScaledCopy(scale);
scaledHitCircle.setAlpha(alpha); scaledHitCircle.setAlpha(alpha);