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

better workaround for #130

Browse Source
This commit is contained in:
yugecin 2017-03-04 00:27:53 +01:00
parent bff4eb3b90
commit 68e0b6fad8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -972,7 +972,6 @@ public class GameData {
float oldWhiteAlpha = Colors.WHITE_FADE.a; float oldWhiteAlpha = Colors.WHITE_FADE.a;
float oldColorAlpha = hitResult.color.a; float oldColorAlpha = hitResult.color.a;
Colors.WHITE_FADE.a = hitResult.color.a = alpha; Colors.WHITE_FADE.a = hitResult.color.a = alpha;
if (!Options.isMergingSliders()) // #issue-130
hitResult.curve.draw(hitResult.color, Options.isMergingSliders() ? 1 : 0, hitResult.curve.getCurvePoints().length); hitResult.curve.draw(hitResult.color, Options.isMergingSliders() ? 1 : 0, hitResult.curve.getCurvePoints().length);
Colors.WHITE_FADE.a = oldWhiteAlpha; Colors.WHITE_FADE.a = oldWhiteAlpha;
hitResult.color.a = oldColorAlpha; hitResult.color.a = oldColorAlpha;

3
src/itdelatrisu/opsu/states/Game.java
View File

@ -1653,6 +1653,9 @@ public class Game extends ComplexOpsuState {
SoundController.mute(false); SoundController.mute(false);
if (Options.isMergingSliders()) { if (Options.isMergingSliders()) {
if (!Options.isShrinkingSliders()) {
knorkesliders = null; // workaround for issue-130
}
if (knorkesliders == null) { if (knorkesliders == null) {
// let's create knorkesliders // let's create knorkesliders
List<Vec2f> curvepoints = new ArrayList<>(); List<Vec2f> curvepoints = new ArrayList<>();