Changeset 2894 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.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/chcdemo.cpp (modified) (7 diffs)

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

@@ -175 +175 @@
 
 static Matrix4x4 matProjectionView = IdentityMatrix();
-static Matrix4x4 matViewing = IdentityMatrix();
-
-ShadowMapping *shadowMapping = NULL;
+
+
+ShadowMap *shadowMap = NULL;
 Light *light = NULL;
 
@@ -433 +433 @@
         DeferredShader::Init(sCgContext);
         SsaoShader::Init(sCgContext);
-        ShadowMapping::Init(sCgContext);
 
 
@@ -446 +445 @@
         light = new Light(lightDir, RgbaColor(1, 1, 1, 1));
 
-        shadowMapping = new ShadowMapping(bvh->GetBox(), 4096);
+        const float shadowSize = 4096;
+        shadowMap = new ShadowMap(shadowSize, bvh->GetBox(), camera);
         
         // frame time is restarted every frame
@@ -796 +796 @@
         /////////////////
 
-        Matrix4x4 matProjection;
+        Matrix4x4 matViewing, matProjection;
 
         camera->GetModelViewMatrix(matViewing);
@@ -904 +904 @@
         case RenderState::DEFERRED:
 
-                shadowMapping->ComputeShadowMap(light, traverser);
+                shadowMap->ComputeShadowMap(light, traverser);
 
                 if (!fbo) InitFBO();
@@ -975 +975 @@
         //-- render sky
 
-        // q: should we render sky after deferred shading? (would conveniently solves some issues)
-        // (e.g, skys without shadows)
+        // q: should we render sky after deferred shading? 
+        // this would conveniently solves some issues (e.g, skys without shadows)
 
         RenderSky();
@@ -999 +999 @@
                         if (!deferredShader) deferredShader = new DeferredShader(texWidth, texHeight, myfar / 10.0f);
                         
-                        //deferredShader->Render(fbo);
-                        deferredShader->Render(fbo, matViewing, shadowMapping);
+                        deferredShader->Render(fbo, shadowMap);
                 }
         }