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

Merge remote-tracking branch 'remotes/origin/master'

Browse Source
This commit is contained in:
yugecin 2016-12-12 19:54:20 +01:00
commit 69cdecca69
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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));
} }
/** /**

7
src/itdelatrisu/opsu/Options.java
View File

@ -514,6 +514,7 @@ public class Options {
}, },
SHOW_HIT_LIGHTING ("Show Hit Lighting", "HitLighting", "Adds an effect behind hit explosions.", true), SHOW_HIT_LIGHTING ("Show Hit Lighting", "HitLighting", "Adds an effect behind hit explosions.", true),
SHOW_HIT_ANIMATIONS ("Show Hit Animations", "HitAnimations", "Fade out circles and curves.", true), SHOW_HIT_ANIMATIONS ("Show Hit Animations", "HitAnimations", "Fade out circles and curves.", true),
SHOW_REVERSEARROW_ANIMATIONS ("Show reverse arrow animations", "ReverseArrowAnimations", "Fade out reverse arrows after passing.", true),
SHOW_COMBO_BURSTS ("Show Combo Bursts", "ComboBurst", "A character image is displayed at combo milestones.", true), SHOW_COMBO_BURSTS ("Show Combo Bursts", "ComboBurst", "A character image is displayed at combo milestones.", true),
SHOW_PERFECT_HIT ("Show Perfect Hits", "PerfectHit", "Whether to show perfect hit result bursts (300s, slider ticks).", true), SHOW_PERFECT_HIT ("Show Perfect Hits", "PerfectHit", "Whether to show perfect hit result bursts (300s, slider ticks).", true),
SHOW_FOLLOW_POINTS ("Show Follow Points", "FollowPoints", "Whether to show follow points between hit objects.", true), SHOW_FOLLOW_POINTS ("Show Follow Points", "FollowPoints", "Whether to show follow points between hit objects.", true),
@ -1430,6 +1431,12 @@ public class Options {
*/ */
public static boolean isHitAnimationEnabled() { return GameOption.SHOW_HIT_ANIMATIONS.getBooleanValue(); } public static boolean isHitAnimationEnabled() { return GameOption.SHOW_HIT_ANIMATIONS.getBooleanValue(); }
/**
* Returns whether or not hit animation effects are enabled.
* @return true if enabled
*/
public static boolean isReverseArrowAnimationEnabled() { return GameOption.SHOW_REVERSEARROW_ANIMATIONS.getBooleanValue(); }
/** /**
* Returns whether or not combo burst effects are enabled. * Returns whether or not combo burst effects are enabled.
* @return true if enabled * @return true if enabled

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

@ -647,6 +647,7 @@ public class Slider extends GameObject {
isNewRepeat = true; isNewRepeat = true;
tickExpandTime = TICK_EXPAND_TIME; tickExpandTime = TICK_EXPAND_TIME;
if (Options.isReverseArrowAnimationEnabled()) {
// send hit result, to fade out reversearrow // send hit result, to fade out reversearrow
HitObjectType type; HitObjectType type;
float posX, posY; float posX, posY;
@ -660,9 +661,8 @@ 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);
} }
} }