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

Very slightly tweaked slider rendering.

Browse Source 
Increased color alpha level, and don't fade the begin/end circles.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-02-23 18:12:31 -05:00
parent 51620772c0
commit 4f0f093b75
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,12 +148,10 @@ public class Slider implements HitObject {
float scale = timeDiff / (float) game.getApproachTime(); float scale = timeDiff / (float) game.getApproachTime();
float approachScale = 1 + scale * 3; float approachScale = 1 + scale * 3;
float x = hitObject.getX(), y = hitObject.getY(); float x = hitObject.getX(), y = hitObject.getY();
float alpha = Utils.clamp(1 - scale, 0, 1);
float oldAlpha = color.a; float oldAlpha = color.a;
float oldAlphaFade = Utils.COLOR_WHITE_FADE.a; color.a = alpha;
float alpha = (1 - scale);
color.a = Utils.clamp(alpha * 0.5f, 0, 1);
alpha = Utils.clamp(alpha, 0, 1);
Utils.COLOR_WHITE_FADE.a = alpha; Utils.COLOR_WHITE_FADE.a = alpha;
// curve // curve
@ -171,6 +169,7 @@ public class Slider implements HitObject {
Image hitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage(); Image hitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage();
Image hitCircle = GameImage.HITCIRCLE.getImage(); Image hitCircle = GameImage.HITCIRCLE.getImage();
color.a = alpha; color.a = alpha;
Utils.COLOR_WHITE_FADE.a = 1f;
// end circle // end circle
float[] endPos = curve.pointAt(1); float[] endPos = curve.pointAt(1);
@ -187,7 +186,6 @@ public class Slider implements HitObject {
hitCircle.getWidth() * 0.40f / data.getDefaultSymbolImage(0).getHeight()); hitCircle.getWidth() * 0.40f / data.getDefaultSymbolImage(0).getHeight());
color.a = oldAlpha; color.a = oldAlpha;
Utils.COLOR_WHITE_FADE.a = oldAlphaFade;
// repeats // repeats
for(int tcurRepeat = currentRepeats; tcurRepeat<=currentRepeats+1; tcurRepeat++){ for(int tcurRepeat = currentRepeats; tcurRepeat<=currentRepeats+1; tcurRepeat++){

11
src/itdelatrisu/opsu/objects/curves/CircumscribedCircle.java
View File

@ -172,14 +172,13 @@ public class CircumscribedCircle extends Curve {
public void draw() { public void draw() {
Image hitCircle = GameImage.HITCIRCLE.getImage(); Image hitCircle = GameImage.HITCIRCLE.getImage();
Image hitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage(); Image hitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage();
float[][] xy = new float[(int) step + 1][];
for (int i = 0; i < step; i++) { for (int i = 0; i < step; i++) {
float[] xy = pointAt(i / step); xy[i] = pointAt(i / step);
hitCircleOverlay.drawCentered(xy[0], xy[1], Utils.COLOR_WHITE_FADE); hitCircleOverlay.drawCentered(xy[i][0], xy[i][1], Utils.COLOR_WHITE_FADE);
}
for (int i = 0; i < step; i++) {
float[] xy = pointAt(i / step);
hitCircle.drawCentered(xy[0], xy[1], color);
} }
for (int i = 0; i < step; i++)
hitCircle.drawCentered(xy[i][0], xy[i][1], color);
} }
@Override @Override