Changeset 2893 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredShader.cpp

Timestamp:

09/02/08 00:56:48 (16 years ago)

Author:

mattausch

Message:

shadowing partly working

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredShader.cpp (modified) (8 diffs)

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

@@ -46 +46 @@
 
 static CGparameter sShadowMatrixParam;
-
-
-
-
-DeferredShader::DeferredShader(int w, int h):
-mWidth(w), mHeight(h)
+static CGparameter sMaxDepthParam;
+
+
+
+DeferredShader::DeferredShader(int w, int h, float scaleFactor):
+mWidth(w), mHeight(h), mScaleFactor(scaleFactor)
 {
         //mFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
@@ -124 +124 @@
                 sNormalsTexShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "normals"); 
                 sShadowMapParam = cgGetNamedParameter(sCgDeferredShadowProgram, "shadowMap");  
-
+                sMaxDepthParam = cgGetNamedParameter(sCgDeferredShadowProgram, "maxDepth");
                 sShadowMatrixParam = cgGetNamedParameter(sCgDeferredShadowProgram, "shadowMatrix");
         }
@@ -184 +184 @@
         glDisable(GL_TEXTURE_2D);
         glDisable(GL_LIGHTING);
+        glDepthMask(GL_FALSE);
+        
 
         glPushAttrib(GL_VIEWPORT_BIT);
@@ -203 +205 @@
 
         glEnable(GL_LIGHTING);
-        glDisable(GL_TEXTURE_2D);
+        glEnable(GL_TEXTURE_2D);
+        glDepthMask(GL_TRUE);
         
         glMatrixMode(GL_PROJECTION);
@@ -332 +335 @@
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
         GLuint shadowMap = shadowMapping->mFbo->GetDepthTex();
-
+/*
         static Matrix4x4 biasMatrix(0.5f, 0.0f, 0.0f, 0.0f,
                                                                 0.0f, 0.5f, 0.0f, 0.0f,
                                                                 0.0f, 0.0f, 0.5f, 0.0f,
                                                                 0.5f, 0.5f, 0.5f, 1.0f); //bias from [-1, 1] to [0, 1]
+*/
+        
+static Matrix4x4 biasMatrix(0.5f, 0.0f, 0.0f, 0.5f,
+                                                                0.0f, 0.5f, 0.0f, 0.5f,
+                                                                0.0f, 0.0f, 0.5f, 0.5f,
+                                                                0.0f, 0.0f, 0.0f, 1.0f); //bias from [-1, 1] to [0, 1]
 
         Matrix4x4 inverseView = matViewing;
@@ -345 +354 @@
         //cout << "matview:\n" << matViewing << endl;
         //cout << "proj:\n" <<  shadowMapping->mLightProjectionMatrix << endl;
-        //cout << "view:\n" <<  shadowMapping->mLightViewMatrix << endl;
+        cout << "view:\n" <<  shadowMapping->mLightViewMatrix << endl;
 
         // compute combined matrix that transforms pixels into light texture space
@@ -353 +362 @@
                                                          inverseView;
 */
-        Matrix4x4 shadowMatrix = //inverseView * 
-                                                         lightProjView * 
-                                                         biasMatrix;
-/*
-Matrix4x4 shadowMatrix = biasMatrix * 
-                                                         lightProjView; 
+        //Matrix4x4 shadowMatrix = //inverseView * lightProjView * biasMatrix;*
+        Matrix4x4 shadowMatrix = lightProjView*biasMatrix; 
                                                          //inverseView;
-*/
                                                          cout << "combined:\n" <<  shadowMatrix << endl;
 
@@ -384 +388 @@
         cgGLSetTextureParameter(sShadowMapParam, shadowMap);
         cgGLEnableTextureParameter(sShadowMapParam);
+
+        cgGLSetParameter1f(sMaxDepthParam, mScaleFactor);
 
         cgGLSetMatrixParameterfc(sShadowMatrixParam, (const float *)shadowMatrix.x);