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

Added slider fading to hit animations

Browse Source
This commit is contained in:
Drew Lemmy
2015-04-07 13:13:43 +01:00
parent 8e8fda7e58
commit 792b511a46
3 changed files with 90 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,7 +281,7 @@ public class Slider implements HitObject {
float[] lastPos = curve.pointAt(1);
data.hitResult(hitObject.getTime() + (int) sliderTimeTotal, result,
x, y, color, comboEnd, hitObject, currentRepeats + 1,
currentRepeats % 2 == 0 ? HitResultType.SLIDEREND_FIRSTOBJECT : HitResultType.SLIDEREND);
currentRepeats % 2 == 0 ? HitResultType.SLIDEREND_FIRSTOBJECT : HitResultType.SLIDEREND, curve);
data.hitResult(hitObject.getTime() + (int) sliderTimeTotal, result,
lastPos[0], lastPos[1], color, comboEnd, hitObject, currentRepeats + 1,
currentRepeats % 2 == 0 ? HitResultType.SLIDEREND : HitResultType.SLIDEREND_FIRSTOBJECT);

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

@@ -28,12 +28,12 @@ import org.newdawn.slick.Color;
* @author fluddokt (https://github.com/fluddokt)
*/
public abstract class Curve {
/** The color of this curve. */
public Color color;
/** The associated OsuHitObject. */
protected OsuHitObject hitObject;
/** The color of this curve. */
protected Color color;
/** The scaled starting x, y coordinates. */
protected float x, y;