sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix leftover merge conflict

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/branches/3.0final@11113 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2014-03-25 02:20:01 +00:00
parent 8ff93b862b
commit 9edf5dc21e
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java
View File

@ -492,20 +492,12 @@ public class LwjglRenderer implements Renderer {
if (state.isAlphaTest() && !context.alphaTestEnabled) { if (state.isAlphaTest() && !context.alphaTestEnabled) {
glEnable(GL_ALPHA_TEST); glEnable(GL_ALPHA_TEST);
<<<<<<< .working
glAlphaFunc(GL_GREATER, state.getAlphaFallOff());
context.alphaTestFallOff = state.getAlphaFallOff();
} else if (!state.isAlphaTest() && context.alphaTestFallOff != 0) {
=======
glAlphaFunc(convertTestFunction(context.alphaFunc), context.alphaTestFallOff); glAlphaFunc(convertTestFunction(context.alphaFunc), context.alphaTestFallOff);
context.alphaTestEnabled = true; context.alphaTestEnabled = true;
} else if (!state.isAlphaTest() && context.alphaTestEnabled) { } else if (!state.isAlphaTest() && context.alphaTestEnabled) {
>>>>>>> .merge-right.r10938
glDisable(GL_ALPHA_TEST); glDisable(GL_ALPHA_TEST);
context.alphaTestEnabled = false; context.alphaTestEnabled = false;
} }
<<<<<<< .working
=======
if (state.getAlphaFallOff() != context.alphaTestFallOff) { if (state.getAlphaFallOff() != context.alphaTestFallOff) {
glAlphaFunc(convertTestFunction(context.alphaFunc), context.alphaTestFallOff); glAlphaFunc(convertTestFunction(context.alphaFunc), context.alphaTestFallOff);
context.alphaTestFallOff = state.getAlphaFallOff(); context.alphaTestFallOff = state.getAlphaFallOff();
@ -514,7 +506,6 @@ public class LwjglRenderer implements Renderer {
glAlphaFunc(convertTestFunction(state.getAlphaFunc()), context.alphaTestFallOff); glAlphaFunc(convertTestFunction(state.getAlphaFunc()), context.alphaTestFallOff);
context.alphaFunc = state.getAlphaFunc(); context.alphaFunc = state.getAlphaFunc();
} }
>>>>>>> .merge-right.r10938
if (state.isDepthWrite() && !context.depthWriteEnabled) { if (state.isDepthWrite() && !context.depthWriteEnabled) {
glDepthMask(true); glDepthMask(true);