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

fix slider circle animation color on mirrored slider

Browse Source
This commit is contained in:
yugecin 2016-12-25 21:48:44 +01:00
parent bcb1ca1296
commit ba10b43f7e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1269,13 +1269,13 @@ public class GameData {
* @param color the slider color * @param color the slider color
* @param expand whether or not the hit result animation should expand * @param expand whether or not the hit result animation should expand
*/ */
public void sendSliderStartResult(int time, float x, float y, Color color, boolean expand) { public void sendSliderStartResult(int time, float x, float y, Color color, Color mirrorColor, boolean expand) {
hitResultList.add(new HitObjectResult(time, HIT_ANIMATION_RESULT, x, y, color, HitObjectType.CIRCLE, null, expand, true)); hitResultList.add(new HitObjectResult(time, HIT_ANIMATION_RESULT, x, y, color, HitObjectType.CIRCLE, null, expand, true));
if (!Options.isMirror()) { if (!Options.isMirror()) {
return; return;
} }
float[] m = Utils.mirrorPoint(x, y); float[] m = Utils.mirrorPoint(x, y);
hitResultList.add(new HitObjectResult(time, HIT_ANIMATION_RESULT, m[0], m[1], color, HitObjectType.CIRCLE, null, expand, true)); hitResultList.add(new HitObjectResult(time, HIT_ANIMATION_RESULT, m[0], m[1], mirrorColor, HitObjectType.CIRCLE, null, expand, true));
} }
/** /**

10
src/itdelatrisu/opsu/objects/Slider.java
View File

@ -595,10 +595,10 @@ public class Slider extends GameObject {
if (timeDiff < hitResultOffset[GameData.HIT_50]) { if (timeDiff < hitResultOffset[GameData.HIT_50]) {
result = GameData.HIT_SLIDER30; result = GameData.HIT_SLIDER30;
ticksHit++; ticksHit++;
data.sendSliderStartResult(trackPosition, this.x, this.y, color, true); data.sendSliderStartResult(trackPosition, this.x, this.y, color, mirrorColor, true);
} else if (timeDiff < hitResultOffset[GameData.HIT_MISS]) { } else if (timeDiff < hitResultOffset[GameData.HIT_MISS]) {
result = GameData.HIT_MISS; result = GameData.HIT_MISS;
data.sendSliderStartResult(trackPosition, this.x, this.y, color, false); data.sendSliderStartResult(trackPosition, this.x, this.y, color, mirrorColor, false);
} }
//else not a hit //else not a hit
@ -627,10 +627,10 @@ public class Slider extends GameObject {
if (isAutoMod) { // "auto" mod: catch any missed notes due to lag if (isAutoMod) { // "auto" mod: catch any missed notes due to lag
ticksHit++; ticksHit++;
data.sendSliderTickResult(time, GameData.HIT_SLIDER30, x, y, hitObject, currentRepeats); data.sendSliderTickResult(time, GameData.HIT_SLIDER30, x, y, hitObject, currentRepeats);
data.sendSliderStartResult(time, x, y, color, true); data.sendSliderStartResult(time, x, y, color, mirrorColor, true);
} else { } else {
data.sendSliderTickResult(time, GameData.HIT_MISS, x, y, hitObject, currentRepeats); data.sendSliderTickResult(time, GameData.HIT_MISS, x, y, hitObject, currentRepeats);
data.sendSliderStartResult(trackPosition, x, y, color, false); data.sendSliderStartResult(trackPosition, x, y, color, mirrorColor, false);
} }
} }
@ -640,7 +640,7 @@ public class Slider extends GameObject {
ticksHit++; ticksHit++;
sliderClickedInitial = true; sliderClickedInitial = true;
data.sendSliderTickResult(time, GameData.HIT_SLIDER30, x, y, hitObject, currentRepeats); data.sendSliderTickResult(time, GameData.HIT_SLIDER30, x, y, hitObject, currentRepeats);
data.sendSliderStartResult(time, x, y, color, true); data.sendSliderStartResult(time, x, y, color, mirrorColor, true);
} }
} }