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

Timestamp:

09/02/08 09:07:45 (16 years ago)

Author:

mattausch

Message:

shadow mapping almost working (but ulgy!!)

File:

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

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

@@ -176 +176 @@
 
 void DeferredShader::Render(FrameBufferObject *fbo, 
-                                                        const Matrix4x4 &matViewing, 
-                                                        ShadowMapping *shadowMapping)
+                                                        ShadowMap *shadowMap)
 {
         cgGLEnableProfile(RenderState::sCgFragmentProfile);
@@ -201 +200 @@
         glOrtho(-offs, offs, -offs, offs, 0, 1);
 
-        FirstPassShadow(fbo, matViewing, shadowMapping);
+        FirstPassShadow(fbo, shadowMap);
         AntiAliasing(fbo);
 
@@ -328 +327 @@
 
 void DeferredShader::FirstPassShadow(FrameBufferObject *fbo, 
-                                                                         const Matrix4x4 &matViewing, 
-                                                                         ShadowMapping *shadowMapping)
+                                                                         ShadowMap *shadowMap)
 {
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();
         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;
-        inverseView.Invert();
-
-        Matrix4x4 lightProjView = shadowMapping->mLightViewMatrix * shadowMapping->mLightProjectionMatrix;
-
-        //cout << "matview:\n" << matViewing << endl;
-        //cout << "proj:\n" <<  shadowMapping->mLightProjectionMatrix << endl;
-        cout << "view:\n" <<  shadowMapping->mLightViewMatrix << endl;
-
-        // compute combined matrix that transforms pixels into light texture space
-        /*Matrix4x4 shadowMatrix = biasMatrix * 
-                                                         shadowMapping->mLightProjectionMatrix * 
-                                                         shadowMapping->mLightViewMatrix *
-                                                         inverseView;
-*/
-        //Matrix4x4 shadowMatrix = //inverseView * lightProjView * biasMatrix;*
-        Matrix4x4 shadowMatrix = lightProjView*biasMatrix; 
-                                                         //inverseView;
-                                                         cout << "combined:\n" <<  shadowMatrix << endl;
+        GLuint shadowTex = shadowMap->GetShadowTexture();
+
+        Matrix4x4 shadowMatrix;
+        shadowMap->GetTextureMatrix(shadowMatrix);
 
         fbo->Bind();
@@ -386 +356 @@
         cgGLEnableTextureParameter(sNormalsTexShadowParam);
         
-        cgGLSetTextureParameter(sShadowMapParam, shadowMap);
+        cgGLSetTextureParameter(sShadowMapParam, shadowTex);
         cgGLEnableTextureParameter(sShadowMapParam);