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

More curve types

Browse Source 
Catmull curves
Line Curves(half assed)
Curve refactor
#73 near 0 length sliders
This commit is contained in:
fd
2015-04-12 10:25:03 -04:00
parent 13d383463f
commit 12e70002d6
11 changed files with 444 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,9 +18,12 @@
package itdelatrisu.opsu.objects.curves;
import itdelatrisu.opsu.GameImage;
import itdelatrisu.opsu.OsuHitObject;
import itdelatrisu.opsu.Utils;
import org.newdawn.slick.Color;
import org.newdawn.slick.Image;
/**
* Representation of a curve.
@@ -28,6 +31,8 @@ import org.newdawn.slick.Color;
* @author fluddokt (https://github.com/fluddokt)
*/
public abstract class Curve {
protected static float CURVE_POINTS_SEPERATION = 50;
/** The associated OsuHitObject. */
protected OsuHitObject hitObject;
@@ -37,6 +42,9 @@ public abstract class Curve {
/** The scaled slider x, y coordinate lists. */
protected float[] sliderX, sliderY;
/** Points along the curve. To be set be inherited classes*/
protected Vec2f[] curve;
/**
* Constructor.
* @param hitObject the associated OsuHitObject
@@ -48,6 +56,7 @@ public abstract class Curve {
this.y = hitObject.getScaledY();
this.sliderX = hitObject.getScaledSliderX();
this.sliderY = hitObject.getScaledSliderY();
CURVE_POINTS_SEPERATION = 5;
}
/**
@@ -61,7 +70,18 @@ public abstract class Curve {
* Draws the full curve to the graphics context.
* @param color the color filter
*/
public abstract void draw(Color color);
public void draw(Color color) {
if ( curve == null){
System.out.println("draw curve"+this);
return;
}
Image hitCircle = GameImage.HITCIRCLE.getImage();
Image hitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage();
for (int i = 0; i < curve.length; i++)
hitCircleOverlay.drawCentered(curve[i].x, curve[i].y, Utils.COLOR_WHITE_FADE);
for (int i = 0; i < curve.length; i++)
hitCircle.drawCentered(curve[i].x, curve[i].y, color);
}
/**
* Returns the angle of the first control point.