follow-up to 1bf9186: don't color the reversearrow black on bright combo color, add mirror reverseerror fade out

This commit is contained in:
yugecin 2016-12-12 08:33:57 +01:00
parent f37264b441
commit 6f46092766
2 changed files with 6 additions and 3 deletions

View File

@ -1213,6 +1213,11 @@ public class GameData {
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));
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));
}
/**

View File

@ -660,9 +660,7 @@ public class Slider extends GameObject {
posX = this.x;
posY = this.y;
}
float colorLuminance = 0.299f*color.r + 0.587f*color.g + 0.114f*color.b;
Color arrowColor = colorLuminance < 0.8f ? Color.white : Color.black;
data.sendRepeatSliderResult(trackPosition, posX, posY, arrowColor, curve, type);
data.sendRepeatSliderResult(trackPosition, posX, posY, Color.white, curve, type);
}
}