Changeset 2949

Timestamp:

09/15/08 20:40:35 (16 years ago)

Author:

mattausch

Message:

depth pass: something is working

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• RenderState.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (8 diffs)
• shaders/mrt.cg (modified) (1 diff)

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

@@ -97 +97 @@
                 mAlphaTestEnabled = false;
                 
-                if (mUseAlphaToCoverage)
+                //if (mUseAlphaToCoverage)
                         glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
-                else
+                //else
                         glDisable(GL_ALPHA_TEST);
         }
@@ -106 +106 @@
                 mAlphaTestEnabled = true;
                 
-                if (mUseAlphaToCoverage)
+                /*if (mUseAlphaToCoverage)
                         glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
                 else
                         glEnable(GL_ALPHA_TEST);
+                        */
         }
 

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

@@ -550 +550 @@
 void InitFBO()
 {
+        PrintGLerror("fbo start");
         // this fbo basicly stores the scene information we get from standard rendering of a frame
         // we store colors, normals, positions (for the ssao)
@@ -946 +947 @@
                 state.Reset();
 
+                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
                 if (!fbo) InitFBO(); fbo->Bind();
+
                 glDrawBuffers(1, mrt);
 
@@ -952 +956 @@
                 cgGLDisableProfile(RenderState::sCgVertexProfile);
 
-                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+                glClear(GL_DEPTH_BUFFER_BIT);
 
                 glDisable(GL_MULTISAMPLE_ARB);
@@ -958 +962 @@
                 state.SetRenderType(RenderState::DEPTH_PASS);
                 state.SetUseAlphaToCoverage(false);
-
+                
+                glDisable(GL_ALPHA_TEST);
+                glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
 
                 state.Reset();
@@ -966 +972 @@
         
                 glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+
+                PrintGLerror("here095");
 
                 break;
@@ -1071 +1079 @@
 
 
-        if ((renderType == RenderState::DEFERRED))// || (renderType == RenderState::DEPTH_PASS_DEFERRED))
+        if ((renderType == RenderState::DEFERRED) || (renderType == RenderState::DEPTH_PASS_DEFERRED))
         {
                 //glPopAttrib();
@@ -1901 +1909 @@
 void RenderVisibleObjects()
 {
-        /*if ((renderType == RenderState::DEPTH_PASS_DEFERRED))
-        {
-                //glDisable(GL_LIGHTING);
-                state.SetUseAlphaToCoverage(false);
-                //FrameBufferObject::Release();
-                InitDeferredRendering();
-
-                glClear(GL_COLOR_BUFFER_BIT || GL_DEPTH_BUFFER_BIT);
-                // draw to 3 color buffers
-                glDrawBuffers(3, mrt);
-        }
-        else*/
-                state.SetRenderType(RenderState::FIXED);
-
-        state.Reset();
-
-        glShadeModel(GL_SMOOTH);
-        glEnable(GL_LIGHTING);
-
-        glDisable(GL_ALPHA);
-        glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
-
-        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-
         // draw all objects that have exactly the same depth as the current sample
         //glDisable(GL_DEPTH_TEST);
         glDepthFunc(GL_LEQUAL);
-        cout << "visible: " << (int)traverser->GetVisibleObjects().size() << endl;
+
+        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+        PrintGLerror("here05");
+        if (renderType == RenderState::DEPTH_PASS_DEFERRED)
+        {
+                if ((renderType == RenderState::DEFERRED) || (renderType == RenderState::DEPTH_PASS_DEFERRED))
+                {
+                        // set modelview matrix for shaders
+                        cgGLSetStateMatrixParameter(sModelViewProjMatrixParam, 
+                                CG_GL_MODELVIEW_PROJECTION_MATRIX, 
+                                CG_GL_MATRIX_IDENTITY);
+
+                        static Matrix4x4 identity = IdentityMatrix();
+                        cgGLSetMatrixParameterfc(Transform3::sModelMatrixParam, (const float *)identity.x);
+                }               
+
+                PrintGLerror("here06");
+
+                glDisable(GL_LIGHTING);
+                state.SetUseAlphaToCoverage(false);
+                
+                glViewport(0, 0, texWidth, texHeight);
+                InitDeferredRendering();
+
+                PrintGLerror("here07");
+                //glClear(GL_COLOR_BUFFER_BIT);
+                // draw to 3 color buffers
+                glDrawBuffers(3, mrt);
+                PrintGLerror("here08");
+                //glClear(GL_DEPTH_BUFFER_BIT);
+        }
+        else
+                state.SetRenderType(RenderState::FIXED);
+
+        PrintGLerror("here2");
+        state.Reset();
+
+        PrintGLerror("here7");
+
+        glShadeModel(GL_SMOOTH);
+        glEnable(GL_LIGHTING);
+
+        PrintGLerror("here8");
+
+        glDisable(GL_ALPHA_TEST);
+        glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
+
+        PrintGLerror("here9");
+
+        PrintGLerror("here3");
+
+        //cout << "visible: " << (int)traverser->GetVisibleObjects().size() << endl;
 
         SceneEntityContainer::const_iterator sit, 
@@ -1942 +1977 @@
         glDepthFunc(GL_LESS);
         state.SetUseAlphaToCoverage(true);
+
+        PrintGLerror("visibleobjects");
 }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/mrt.cg

@@ -112 +112 @@
         pix.pos = IN.worldPos * maxDepth;
 
-        //pix.norm.xyz = IN.normal * 0.5f + float3(0.5f);
         pix.norm.xyz = IN.normal;