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

Follow-up to #91.

Browse Source 
Pass the border color into CurveRenderState instead of determining it there; store the color as a static field in Curve (since it shouldn't change per-beatmap).

Also removed the leftover FrameBufferCache warning from #64.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-06-08 16:42:54 -04:00
parent a7d05a4b26
commit b1b1664e11
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,9 @@ public abstract class Curve {
/** Points generated along the curve should be spaced this far apart. */
protected static float CURVE_POINTS_SEPERATION = 5;
/** The curve border color. */
private static Color borderColor;
/** Whether OpenGL 3.0 is supported. */
private static boolean openGL30 = false;
@@ -77,8 +80,10 @@ public abstract class Curve {
* @param width the container width
* @param height the container height
* @param circleSize the circle size
* @param borderColor the curve border color
*/
public static void init(int width, int height, float circleSize) {
public static void init(int width, int height, float circleSize, Color borderColor) {
Curve.borderColor = borderColor;
openGL30 = GLContext.getCapabilities().OpenGL30;
if (openGL30)
CurveRenderState.init(width, height, circleSize);
@@ -117,7 +122,7 @@ public abstract class Curve {
else {
if (renderState == null)
renderState = new CurveRenderState(hitObject);
renderState.draw(color, curve);
renderState.draw(color, borderColor, curve);
}
}