also use splice for non-merging sliders instead of reverse

This commit is contained in:
yugecin
2016-12-04 22:03:09 +01:00
parent 0eb09d4e0d
commit 8171cfdec6
3 changed files with 8 additions and 27 deletions

View File

@@ -379,14 +379,6 @@ public class Slider extends GameObject {
float curveIntervalTo = Options.isSliderSnaking() ? snakingSliderProgress : 1f;
float curveIntervalFrom = 0f;
if (Options.isShrinkingSliders()) {
// 1 repeat = no repeats..
if (repeats % 2 == 0 && curveIntervalTo == 1 && !reversed) {
// fix shrinking sliders for odd repeating sliders
reversed = true;
if (!Options.isMergingSliders()) {
curve.reverse();
}
}
float sliderprogress = (trackPosition - getTime() - (sliderTime * (repeats - 1))) / sliderTime;
if (sliderprogress > 0) {
curveIntervalFrom = sliderprogress;
@@ -403,6 +395,13 @@ public class Slider extends GameObject {
}
game.setSlidercurveTo(baseSliderFrom + (int) (curveIntervalTo * curve.getCurvePoints().length));
} else {
if (Options.isShrinkingSliders() && curveIntervalFrom > 0) {
int curvelen = curve.getCurvePoints().length;
if (repeats % 2 == 0) {
curve.splice((int) ((1f - curveIntervalFrom) * curvelen), curvelen);
curveIntervalFrom = 0f;
}
}
curve.draw(curveColor, curveIntervalFrom, curveIntervalTo);
}
return curveIntervalTo == 1f;

View File

@@ -159,10 +159,6 @@ public abstract class Curve {
}
}
public void reverse() {
renderState.reverse();
}
public void splice(int from, int to) {
renderState.splice(from, to);
}