fix slider circle animation color on mirrored slider
This commit is contained in:
parent
bcb1ca1296
commit
ba10b43f7e
|
@ -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));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user