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

fix blending... and update slidergradient

Browse Source
This commit is contained in:
yugecin 2016-12-05 20:48:38 +01:00
parent 601280cfa3
commit cfc5426963
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/slidergradient.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

8
src/itdelatrisu/opsu/render/CurveRenderState.java
View File

@ -225,7 +225,7 @@ public class CurveRenderState {
state.oldProgram = GL11.glGetInteger(GL20.GL_CURRENT_PROGRAM); state.oldProgram = GL11.glGetInteger(GL20.GL_CURRENT_PROGRAM);
state.oldArrayBuffer = GL11.glGetInteger(GL15.GL_ARRAY_BUFFER_BINDING); state.oldArrayBuffer = GL11.glGetInteger(GL15.GL_ARRAY_BUFFER_BINDING);
GL11.glDisable(GL11.GL_POLYGON_SMOOTH); GL11.glDisable(GL11.GL_POLYGON_SMOOTH);
//GL11.glEnable(GL11.GL_BLEND); GL11.glDisable(GL11.GL_BLEND);
GL14.glBlendEquation(GL14.GL_FUNC_ADD); GL14.glBlendEquation(GL14.GL_FUNC_ADD);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL11.GL_DEPTH_TEST);
@ -258,7 +258,7 @@ public class CurveRenderState {
GL11.glPopMatrix(); GL11.glPopMatrix();
GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glMatrixMode(GL11.GL_MODELVIEW);
GL11.glPopMatrix(); GL11.glPopMatrix();
//GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_BLEND);
GL20.glUseProgram(state.oldProgram); GL20.glUseProgram(state.oldProgram);
GL13.glActiveTexture(state.texUnit); GL13.glActiveTexture(state.texUnit);
GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, state.oldArrayBuffer); GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, state.oldArrayBuffer);
@ -270,8 +270,8 @@ public class CurveRenderState {
GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glEnable(GL11.GL_TEXTURE_2D);
if (state.smoothedPoly) if (state.smoothedPoly)
GL11.glEnable(GL11.GL_POLYGON_SMOOTH); GL11.glEnable(GL11.GL_POLYGON_SMOOTH);
//if (!state.blendEnabled) if (!state.blendEnabled)
// GL11.glDisable(GL11.GL_BLEND); GL11.glDisable(GL11.GL_BLEND);
} }
/** /**