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

Removed leftover/unused 'color' parameter in Curve constructor.

Browse Source 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-09-01 21:57:37 -05:00
parent e3d8a11c39
commit fdd70a81c4
6 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,11 +527,11 @@ public class Slider implements GameObject {
this.y = hitObject.getScaledY();
if (hitObject.getSliderType() == HitObject.SLIDER_PASSTHROUGH && hitObject.getSliderX().length == 2)
this.curve = new CircumscribedCircle(hitObject, color);
this.curve = new CircumscribedCircle(hitObject);
else if (hitObject.getSliderType() == HitObject.SLIDER_CATMULL)
this.curve = new CatmullCurve(hitObject, color);
this.curve = new CatmullCurve(hitObject);
else
this.curve = new LinearBezier(hitObject, color, hitObject.getSliderType() == HitObject.SLIDER_LINEAR);
this.curve = new LinearBezier(hitObject, hitObject.getSliderType() == HitObject.SLIDER_LINEAR);
}
@Override

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

@ -23,7 +23,6 @@ import itdelatrisu.opsu.beatmap.HitObject;
import java.util.LinkedList;
import org.newdawn.slick.Color;
import org.newdawn.slick.SlickException;
/**
@ -35,10 +34,9 @@ public class CatmullCurve extends EqualDistanceMultiCurve {
/**
* Constructor.
* @param hitObject the associated HitObject
* @param color the color of this curve
*/
public CatmullCurve(HitObject hitObject, Color color) {
super(hitObject, color);
public CatmullCurve(HitObject hitObject) {
super(hitObject);
LinkedList<CurveType> catmulls = new LinkedList<CurveType>();
int ncontrolPoints = hitObject.getSliderX().length + 1;
LinkedList<Vec2f> points = new LinkedList<Vec2f>(); // temporary list of points to separate different curves

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

@ -22,8 +22,6 @@ import itdelatrisu.opsu.ErrorHandler;
import itdelatrisu.opsu.Utils;
import itdelatrisu.opsu.beatmap.HitObject;
import org.newdawn.slick.Color;
/**
* Representation of a curve along a Circumscribed Circle of three points.
* http://en.wikipedia.org/wiki/Circumscribed_circle
@ -54,10 +52,9 @@ public class CircumscribedCircle extends Curve {
/**
* Constructor.
* @param hitObject the associated HitObject
* @param color the color of this curve
*/
public CircumscribedCircle(HitObject hitObject, Color color) {
super(hitObject, color);
public CircumscribedCircle(HitObject hitObject) {
super(hitObject);
// construct the three points
this.start = new Vec2f(getX(0), getY(0));

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

@ -64,9 +64,8 @@ public abstract class Curve {
/**
* Constructor.
* @param hitObject the associated HitObject
* @param color the color of this curve
*/
protected Curve(HitObject hitObject, Color color) {
protected Curve(HitObject hitObject) {
this.hitObject = hitObject;
this.x = hitObject.getScaledX();
this.y = hitObject.getScaledY();

7
src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java
View File

@ -24,8 +24,6 @@ import itdelatrisu.opsu.beatmap.HitObject;
import java.util.Iterator;
import java.util.LinkedList;
import org.newdawn.slick.Color;
/**
* Representation of multiple curve with equidistant points.
* http://pomax.github.io/bezierinfo/#tracing
@ -42,10 +40,9 @@ public abstract class EqualDistanceMultiCurve extends Curve {
/**
* Constructor.
* @param hitObject the associated HitObject
* @param color the color of this curve
*/
public EqualDistanceMultiCurve(HitObject hitObject, Color color) {
super(hitObject, color);
public EqualDistanceMultiCurve(HitObject hitObject) {
super(hitObject);
}
/**

7
src/itdelatrisu/opsu/objects/curves/LinearBezier.java
View File

@ -22,8 +22,6 @@ import itdelatrisu.opsu.beatmap.HitObject;
import java.util.LinkedList;
import org.newdawn.slick.Color;
/**
* Representation of Bezier curve with equidistant points.
* http://pomax.github.io/bezierinfo/#tracing
@ -34,11 +32,10 @@ public class LinearBezier extends EqualDistanceMultiCurve {
/**
* Constructor.
* @param hitObject the associated HitObject
* @param color the color of this curve
* @param line whether a new curve should be generated for each sequential pair
*/
public LinearBezier(HitObject hitObject, Color color, boolean line) {
super(hitObject, color);
public LinearBezier(HitObject hitObject, boolean line) {
super(hitObject);
LinkedList<CurveType> beziers = new LinkedList<CurveType>();