Changeset 728Tweet

Timestamp:

Mar 7, 2011, 7:05:40 PM (10 years ago)

Author:

sam

Message:

gl: reactivate depth test and blending on GLES 1.x.

File:

• trunk/src/scene.cpp (modified) (2 diffs)

trunk/src/scene.cpp

@@ -37 +37 @@
 extern Shader *stdshader;
 #endif
-extern mat4 proj_matrix, view_matrix, model_matrix;
+extern mat4 model_matrix;
 
 /*
@@ -178 +178 @@
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 #else
-    //glEnable(GL_DEPTH_TEST);
-    //glDepthFunc(GL_LEQUAL);
-    //glEnable(GL_ALPHA_TEST);
-    //glAlphaFunc(GL_GEQUAL, 0.01f);
-    //glEnable(GL_BLEND);
-    //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-#if 0
-    /* Reset all model-view-projection matrices */
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-    glLoadIdentity();
-    glMultMatrixf(&proj_matrix[0][0]);
-#endif
+    glEnable(GL_DEPTH_TEST);
+    glDepthFunc(GL_LEQUAL);
+    glEnable(GL_ALPHA_TEST);
+    glAlphaFunc(GL_GEQUAL, 0.01f);
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
     glLoadIdentity();
-    //glMultMatrixf(&model_matrix[0][0]);
-    glMultMatrixf(&view_matrix[0][0]);
+    glMultMatrixf(&model_matrix[0][0]);
 
     /* Set up state machine */
-    glDisable(GL_DEPTH_TEST);
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
     glEnable(GL_TEXTURE_2D);
     glEnableClientState(GL_VERTEX_ARRAY);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 #endif