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

Merge branch 'master' of https://github.com/itdelatrisu/opsu into 'upstream'

Browse Source 
# Conflicts:
#	README.md
#	src/itdelatrisu/opsu/Opsu.java
#	src/itdelatrisu/opsu/Utils.java
#	src/itdelatrisu/opsu/render/CurveRenderState.java
#	src/itdelatrisu/opsu/states/Game.java
This commit is contained in:
yugecin
2016-12-10 01:19:31 +01:00
parent 4c64eee4db 38daee002f
commit e878f0fb0d
17 changed files with 412 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,12 +101,12 @@ public abstract class Curve {
Curve.borderColor = borderColor;
ContextCapabilities capabilities = GLContext.getCapabilities();
mmsliderSupported = capabilities.GL_EXT_framebuffer_object;
mmsliderSupported = capabilities.OpenGL20;
if (mmsliderSupported)
CurveRenderState.init(width, height, circleDiameter);
else {
if (Options.getSkin().getSliderStyle() != Skin.STYLE_PEPPYSLIDER)
Log.warn("New slider style requires FBO support.");
Log.warn("New slider style requires OpenGL 2.0.");
}
}
@@ -190,8 +190,8 @@ public abstract class Curve {
/**
* Discards the slider cache (only used for mmsliders).
*/
public void discardCache() {
public void discardGeometry() {
if (renderState != null)
renderState.discardCache();
renderState.discardGeometry();
}
}