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

attemt to fix shrinking sliders with odd amount of repeats with merged slider rendering

Browse Source
This commit is contained in:
yugecin
2016-12-04 21:52:15 +01:00
parent 50f475e0f7
commit a3af1c71b8
4 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -383,9 +383,7 @@ public class Slider extends GameObject {
if (repeats % 2 == 0 && curveIntervalTo == 1 && !reversed) {
// fix shrinking sliders for odd repeating sliders
reversed = true;
if (Options.isMergingSliders()) {
} else {
if (!Options.isMergingSliders()) {
curve.reverse();
}
}
@@ -396,7 +394,12 @@ public class Slider extends GameObject {
}
if (Options.isMergingSliders()) {
if (Options.isShrinkingSliders() && curveIntervalFrom > 0) {
game.setSlidercurveFrom(baseSliderFrom + (int) (curveIntervalFrom * curve.getCurvePoints().length));
int curvelen = curve.getCurvePoints().length;
if (repeats % 2 == 0) {
game.spliceSliderCurve(baseSliderFrom + (int) ((1f - curveIntervalFrom) * curvelen), baseSliderFrom + curvelen);
} else {
game.setSlidercurveFrom(baseSliderFrom + (int) (curveIntervalFrom * curvelen));
}
}
game.setSlidercurveTo(baseSliderFrom + (int) (curveIntervalTo * curve.getCurvePoints().length));
} else {
@@ -587,7 +590,7 @@ public class Slider extends GameObject {
// calculate and send slider result
hitResult();
if (Options.isMergingSliders()) {
game.setSlidercurveFrom(baseSliderFrom + curve.getCurvePoints().length);
game.setSlidercurveFrom(baseSliderFrom + curve.getCurvePoints().length + 1);
}
return true;
}

6
src/itdelatrisu/opsu/objects/curves/Curve.java
View File

@@ -160,11 +160,13 @@ public abstract class Curve {
}
public void reverse() {
if (renderState == null)
renderState = new CurveRenderState(hitObject, curve);
renderState.reverse();
}
public void splice(int from, int to) {
renderState.splice(from, to);
}
/**
* Returns the angle of the first control point.
*/