From 6f46092766013c95ccc1af46928d5619a5c5ca06 Mon Sep 17 00:00:00 2001 From: yugecin Date: Mon, 12 Dec 2016 08:33:57 +0100 Subject: [PATCH] follow-up to 1bf9186: don't color the reversearrow black on bright combo color, add mirror reverseerror fade out --- src/itdelatrisu/opsu/GameData.java | 5 +++++ src/itdelatrisu/opsu/objects/Slider.java | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java index 4fc84f19..d8beae19 100644 --- a/src/itdelatrisu/opsu/GameData.java +++ b/src/itdelatrisu/opsu/GameData.java @@ -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)); } /** diff --git a/src/itdelatrisu/opsu/objects/Slider.java b/src/itdelatrisu/opsu/objects/Slider.java index 12d8fd83..41b9a0b4 100644 --- a/src/itdelatrisu/opsu/objects/Slider.java +++ b/src/itdelatrisu/opsu/objects/Slider.java @@ -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); } }