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

attempt to fix shrinking sliders

Browse Source
This commit is contained in:
yugecin
2016-12-10 19:30:21 +01:00
parent 7126cd58a5
commit d96bbd3a08
5 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,9 +209,9 @@ public class Slider extends GameObject {
final int fadeInTime = game.getFadeInTime();
float scale = timeDiff / (float) approachTime;
float approachScale = 1 + scale * 3;
float fadeinScale = (timeDiff - approachTime + fadeInTime) / (float) fadeInTime;
float alpha = Utils.clamp(1 - fadeinScale, 0, 1);
float decorationsAlpha = Utils.clamp(-2.0f * fadeinScale, 0, 1);
double fadeinScale = (timeDiff - approachTime + fadeInTime) / (double) fadeInTime;
float alpha = Utils.clamp(1 - (float) fadeinScale, 0, 1);
float decorationsAlpha = Utils.clamp(-2.0f * (float) fadeinScale, 0, 1);
boolean overlayAboveNumber = Options.getSkin().isHitCircleOverlayAboveNumber();
float oldAlpha = Colors.WHITE_FADE.a;
Colors.WHITE_FADE.a = color.a = alpha;
@@ -225,7 +225,7 @@ public class Slider extends GameObject {
}
curveColor.a = curveAlpha;
boolean isCurveCompletelyDrawn = drawSliderTrack(trackPosition, alpha);
boolean isCurveCompletelyDrawn = drawSliderTrack(trackPosition, Utils.clamp(1d - fadeinScale, 0d, 1d));
color.a = alpha;
g.pushTransform();
@@ -401,40 +401,39 @@ public class Slider extends GameObject {
}
}
private boolean drawSliderTrack(int trackPosition, float snakingSliderProgress) {
float curveIntervalTo = Options.isSliderSnaking() ? snakingSliderProgress : 1f;
float curveIntervalFrom = 0f;
private boolean drawSliderTrack(int trackPosition, double snakingSliderProgress) {
double curveIntervalTo = Options.isSliderSnaking() ? snakingSliderProgress : 1d;
double curveIntervalFrom = 0d;
if (Options.isShrinkingSliders()) {
float sliderprogress = (trackPosition - getTime() - (sliderTime * (repeats - 1))) / sliderTime;
double sliderprogress = (trackPosition - getTime() - ((double) sliderTime * (repeats - 1))) / (double) sliderTime;
if (sliderprogress > 0) {
curveIntervalFrom = sliderprogress;
}
}
int curvelen = curve.getCurvePoints().length;
if (Options.isMergingSliders()) {
if (Options.isShrinkingSliders() && curveIntervalFrom > 0) {
int curvelen = curve.getCurvePoints().length;
if (repeats % 2 == 0) {
game.spliceSliderCurve(baseSliderFrom + (int) ((1f - curveIntervalFrom) * curvelen), baseSliderFrom + curvelen);
game.spliceSliderCurve(baseSliderFrom + (int) ((1d - curveIntervalFrom) * curvelen), baseSliderFrom + curvelen + 1);
} else {
game.setSlidercurveFrom(baseSliderFrom + (int) (curveIntervalFrom * curvelen) + 1);
game.setSlidercurveFrom(baseSliderFrom + (int) (curveIntervalFrom * curvelen));
}
}
game.setSlidercurveTo(baseSliderFrom + (int) (curveIntervalTo * curve.getCurvePoints().length));
} else {
if (Options.isFallbackSliders() && curveIntervalFrom > 0 && repeats % 2 == 0) {
curve.draw(curveColor, 1f - curveIntervalTo, 1f - curveIntervalFrom);
curve.draw(curveColor, (int) (curveIntervalFrom * curvelen), (int) (curveIntervalTo * curvelen));
} else {
if (Options.isShrinkingSliders() && curveIntervalFrom > 0 && !Options.isFallbackSliders()) {
int curvelen = curve.getCurvePoints().length;
if (repeats % 2 == 0) {
curve.splice((int) ((1f - curveIntervalFrom) * curvelen), curvelen);
curveIntervalFrom = 0f;
curve.splice((int) ((1d - curveIntervalFrom) * curvelen), curvelen);
curveIntervalFrom = 0d;
}
}
curve.draw(curveColor, curveIntervalFrom, curveIntervalTo);
curve.draw(curveColor, (int) (curveIntervalFrom * curvelen), (int) (curveIntervalTo * curvelen));
}
}
return curveIntervalTo == 1f;
return curveIntervalTo == 1d;
}
/**

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

@@ -121,32 +121,27 @@ public abstract class Curve {
* Draws the full curve to the graphics context.
* @param color the color filter
*/
public void draw(Color color) { draw(color, 0f, 1f); }
public void draw(Color color) { draw(color, 0, curve.length); }
/**
* Draws the curve in the range [0, t] (where the full range is [0, 1]) to the graphics context.
* @param color the color filter
* @param t1 interval to draw from
* @param t2 interval to draw to
* @param from index to draw from
* @param to index to draw to (exclusive)
*/
public void draw(Color color, float t1, float t2) {
public void draw(Color color, int from, int to) {
if (curve == null)
return;
t1 = Utils.clamp(t1, 0f, 1f);
t2 = Utils.clamp(t2, 0f, 1f);
// peppysliders
if (Options.isFallbackSliders() || Options.getSkin().getSliderStyle() == Skin.STYLE_PEPPYSLIDER || !mmsliderSupported) {
int drawFrom = (int) (curve.length * t1);
int drawUpTo = (int) (curve.length * t2);
Image hitCircle = GameImage.HITCIRCLE.getImage();
Image hitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage();
for (int i = drawFrom; i < drawUpTo; i++)
for (int i = from; i < to; i++)
hitCircleOverlay.drawCentered(curve[i].x, curve[i].y, Colors.WHITE_FADE);
float a = fallbackSliderColor.a;
fallbackSliderColor.a = color.a;
for (int i = drawFrom; i < drawUpTo; i++)
for (int i = from; i < to; i++)
hitCircle.drawCentered(curve[i].x, curve[i].y, fallbackSliderColor);
fallbackSliderColor.a = a;
}
@@ -155,7 +150,7 @@ public abstract class Curve {
else {
if (renderState == null)
renderState = new CurveRenderState(hitObject, curve);
renderState.draw(color, borderColor, t1, t2);
renderState.draw(color, borderColor, from, to);
}
}