diff --git a/src/itdelatrisu/opsu/objects/Slider.java b/src/itdelatrisu/opsu/objects/Slider.java index 12bfa93a..5c01a9b3 100644 --- a/src/itdelatrisu/opsu/objects/Slider.java +++ b/src/itdelatrisu/opsu/objects/Slider.java @@ -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 diff --git a/src/itdelatrisu/opsu/objects/curves/CatmullCurve.java b/src/itdelatrisu/opsu/objects/curves/CatmullCurve.java index df59b032..05241a6c 100644 --- a/src/itdelatrisu/opsu/objects/curves/CatmullCurve.java +++ b/src/itdelatrisu/opsu/objects/curves/CatmullCurve.java @@ -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 catmulls = new LinkedList(); int ncontrolPoints = hitObject.getSliderX().length + 1; LinkedList points = new LinkedList(); // temporary list of points to separate different curves diff --git a/src/itdelatrisu/opsu/objects/curves/CircumscribedCircle.java b/src/itdelatrisu/opsu/objects/curves/CircumscribedCircle.java index 0a9f2f8b..591a2ab1 100644 --- a/src/itdelatrisu/opsu/objects/curves/CircumscribedCircle.java +++ b/src/itdelatrisu/opsu/objects/curves/CircumscribedCircle.java @@ -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)); diff --git a/src/itdelatrisu/opsu/objects/curves/Curve.java b/src/itdelatrisu/opsu/objects/curves/Curve.java index 9caabe41..417cf1c8 100644 --- a/src/itdelatrisu/opsu/objects/curves/Curve.java +++ b/src/itdelatrisu/opsu/objects/curves/Curve.java @@ -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(); diff --git a/src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java b/src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java index ec8557b0..fb2dfdbf 100644 --- a/src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java +++ b/src/itdelatrisu/opsu/objects/curves/EqualDistanceMultiCurve.java @@ -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); } /** diff --git a/src/itdelatrisu/opsu/objects/curves/LinearBezier.java b/src/itdelatrisu/opsu/objects/curves/LinearBezier.java index 3ec6717a..b57b65ae 100644 --- a/src/itdelatrisu/opsu/objects/curves/LinearBezier.java +++ b/src/itdelatrisu/opsu/objects/curves/LinearBezier.java @@ -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 beziers = new LinkedList();