follow-up to 1bf9186: don't color the reversearrow black on bright combo color, add mirror reverseerror fade out
This commit is contained in:
parent
f37264b441
commit
6f46092766
|
@ -1213,6 +1213,11 @@ public class GameData {
|
||||||
|
|
||||||
public void sendRepeatSliderResult(int time, float x, float y, Color color, Curve curve, HitObjectType type) {
|
public void sendRepeatSliderResult(int time, float x, float y, Color color, Curve curve, HitObjectType type) {
|
||||||
hitResultList.add(new HitObjectResult(time, HIT_SLIDER_REPEAT, x, y, color, type, curve, true, true));
|
hitResultList.add(new HitObjectResult(time, HIT_SLIDER_REPEAT, x, y, color, type, curve, true, true));
|
||||||
|
if (Options.isMirror()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
float[] m = Utils.mirrorPoint(x, y);
|
||||||
|
hitResultList.add(new HitObjectResult(time, HIT_SLIDER_REPEAT, m[0], m[1], color, type, curve, true, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -660,9 +660,7 @@ public class Slider extends GameObject {
|
||||||
posX = this.x;
|
posX = this.x;
|
||||||
posY = this.y;
|
posY = this.y;
|
||||||
}
|
}
|
||||||
float colorLuminance = 0.299f*color.r + 0.587f*color.g + 0.114f*color.b;
|
data.sendRepeatSliderResult(trackPosition, posX, posY, Color.white, curve, type);
|
||||||
Color arrowColor = colorLuminance < 0.8f ? Color.white : Color.black;
|
|
||||||
data.sendRepeatSliderResult(trackPosition, posX, posY, arrowColor, curve, type);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user