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

Properly check if new slider rendering is supported. (#98)

Browse Source 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-06-21 21:32:00 -05:00
parent 0112a03bd3
commit 392df79596
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ import itdelatrisu.opsu.beatmap.HitObject;
import itdelatrisu.opsu.render.CurveRenderState; import itdelatrisu.opsu.render.CurveRenderState;
import itdelatrisu.opsu.skins.Skin; import itdelatrisu.opsu.skins.Skin;
import org.lwjgl.opengl.ContextCapabilities;
import org.lwjgl.opengl.GLContext; import org.lwjgl.opengl.GLContext;
import org.newdawn.slick.Color; import org.newdawn.slick.Color;
import org.newdawn.slick.Image; import org.newdawn.slick.Image;
@ -42,8 +43,8 @@ public abstract class Curve {
/** The curve border color. */ /** The curve border color. */
private static Color borderColor; private static Color borderColor;
/** Whether OpenGL 3.0 is supported. */ /** Whether mmsliders are supported. */
private static boolean openGL30 = false; private static boolean mmsliderSupported = false;
/** The associated HitObject. */ /** The associated HitObject. */
protected HitObject hitObject; protected HitObject hitObject;
@ -84,12 +85,14 @@ public abstract class Curve {
*/ */
public static void init(int width, int height, float circleSize, Color borderColor) { public static void init(int width, int height, float circleSize, Color borderColor) {
Curve.borderColor = borderColor; Curve.borderColor = borderColor;
openGL30 = GLContext.getCapabilities().OpenGL30;
if (openGL30) ContextCapabilities capabilities = GLContext.getCapabilities();
mmsliderSupported = capabilities.GL_EXT_framebuffer_object && capabilities.OpenGL32;
if (mmsliderSupported)
CurveRenderState.init(width, height, circleSize); CurveRenderState.init(width, height, circleSize);
else { else {
if (Options.getSkin().getSliderStyle() != Skin.STYLE_PEPPYSLIDER) if (Options.getSkin().getSliderStyle() != Skin.STYLE_PEPPYSLIDER)
Log.warn("New slider style requires OpenGL 3.0, which is not supported."); Log.warn("New slider style requires FBO support and OpenGL 3.2.");
} }
} }
@ -109,7 +112,7 @@ public abstract class Curve {
return; return;
// peppysliders // peppysliders
if (Options.getSkin().getSliderStyle() == Skin.STYLE_PEPPYSLIDER || !openGL30) { if (Options.getSkin().getSliderStyle() == Skin.STYLE_PEPPYSLIDER || !mmsliderSupported) {
Image hitCircle = GameImage.HITCIRCLE.getImage(); Image hitCircle = GameImage.HITCIRCLE.getImage();
Image hitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage(); Image hitCircleOverlay = GameImage.HITCIRCLE_OVERLAY.getImage();
for (int i = 0; i < curve.length; i++) for (int i = 0; i < curve.length; i++)