Changeset 2801 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderState.cpp

Timestamp:

06/27/08 13:33:46 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderState.cpp (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderState.cpp

@@ -12 +12 @@
 mAlphaTestEnabled(false), 
 mTexturesEnabled(false), 
-mMode(RENDER) 
+mMode(RENDER),
+mIsDepthPass(false)
 {
         Reset(); 
@@ -29 +30 @@
         if (mode == QUERY)
         {
-                //glDisableClientState(GL_NORMAL_ARRAY);
-                glDisable(GL_LIGHTING);
-                glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+                if (!mIsDepthPass)
+                {
+                        glDisable(GL_LIGHTING);
+                        glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+                }
+
                 glDepthMask(GL_FALSE);
 
@@ -41 +45 @@
                 //-- restore render state
 
-                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+                if (!mIsDepthPass)
+                {
+                        glEnable(GL_LIGHTING);
+                        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+                }
+
                 glDepthMask(GL_TRUE);
-                glEnable(GL_LIGHTING);
         }
 
@@ -52 +60 @@
 void RenderState::SetState(bool texturing, bool alphaTest)
 {
-        if (mTexturesEnabled && !texturing) 
-        {
-                mTexturesEnabled = false;
-                glDisable(GL_TEXTURE_2D);
-                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-        }
-        else if (!mTexturesEnabled && texturing)
-        {
-                mTexturesEnabled = true;
-                //glEnable(GL_TEXTURE_2D);
-                //glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        }
-
         if (mAlphaTestEnabled && !alphaTest) 
         {
@@ -73 +68 @@
         {
                 mAlphaTestEnabled = true;
-                //glEnable(GL_ALPHA_TEST);
-                //glAlphaFunc(GL_GEQUAL, 0.5f);
+                glEnable(GL_ALPHA_TEST);
+        }
+
+        // allow only alpha textures in depth pass
+        if (mTexturesEnabled && 
+                (!texturing || mIsDepthPass && !mAlphaTestEnabled))
+        {
+                mTexturesEnabled = false;
+                glDisable(GL_TEXTURE_2D);
+                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        }
+        else if (!mTexturesEnabled && texturing)
+        {
+                if (!mIsDepthPass || mAlphaTestEnabled)
+                {
+                        mTexturesEnabled = true;
+                        glEnable(GL_TEXTURE_2D);
+                        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+                }
         }
 }