Changeset 2897 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

09/03/08 01:57:45 (16 years ago)

Author:

mattausch

Message:

improved shadow mapping

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (10 diffs)

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

@@ -83 +83 @@
 RenderQueue *renderQueue = NULL;
 
+// traverses and renders the hierarchy
+RenderTraverser *shadowTraverser = NULL;
+
+
 /// these values get scaled with the frame rate
 static float keyForwardMotion = 30.0f;
@@ -211 +215 @@
 void MiddleMotion(int x, int y);
 void CalcDecimalPoint(string &str, int d);
-void ResetTraverser();
+
+RenderTraverser *CreateTraverser(Camera *cam);
 
 void KeyHorizontalMotion(float shift);
@@ -427 +432 @@
         bvh->SetVirtualLeaves(trianglesPerVirtualLeaf);
 
-        bvh->SetCamera(camera);
+        //bvh->SetCamera(camera);
         
         InitCg();
@@ -435 +440 @@
 
         // initialize the render traverser
-        ResetTraverser();
+        traverser = CreateTraverser(camera);
 
         visualization = new Visualization(bvh, camera, NULL, &state);
-
+        
+        state.SetRenderType(RenderState::FIXED);
         sceneQuery = new SceneQuery(bvh->GetBox(), traverser);
 
@@ -691 +697 @@
 
 
-void ResetTraverser()
-{
-        DEL_PTR(traverser);
-
+RenderTraverser *CreateTraverser(Camera *cam)
+{
+        RenderTraverser *tr;
+        
         bvh->ResetNodeClassifications();
 
@@ -700 +706 @@
         {
         case RenderTraverser::CULL_FRUSTUM:
-                traverser = new FrustumCullingTraverser();
+                tr = new FrustumCullingTraverser();
                 break;
         case RenderTraverser::STOP_AND_WAIT:
-                traverser = new StopAndWaitTraverser();
+                tr = new StopAndWaitTraverser();
                 break;
         case RenderTraverser::CHC:
-                traverser = new CHCTraverser();
+                tr = new CHCTraverser();
                 break;
         case RenderTraverser::CHCPLUSPLUS:
-                traverser = new CHCPlusPlusTraverser();
+                tr = new CHCPlusPlusTraverser();
                 break;
         
         default:
-                traverser = new FrustumCullingTraverser();
-        }
-
-        traverser->SetCamera(camera);
-        traverser->SetHierarchy(bvh);
-        traverser->SetRenderQueue(renderQueue);
-        traverser->SetRenderState(&state);
-        traverser->SetUseOptimization(useOptimization);
-        traverser->SetUseRenderQueue(useRenderQueue);
-        traverser->SetVisibilityThreshold(threshold);
-        traverser->SetAssumedVisibleFrames(assumedVisibleFrames);
-        traverser->SetMaxBatchSize(maxBatchSize);
-        traverser->SetUseMultiQueries(useMultiQueries);
-        traverser->SetUseTightBounds(useTightBounds);
-        traverser->SetUseDepthPass(renderType == RenderState::DEPTH_PASS);
-        traverser->SetRenderQueue(renderQueue);
+                tr = new FrustumCullingTraverser();
+        }
+
+        tr->SetCamera(cam);
+        tr->SetHierarchy(bvh);
+        tr->SetRenderQueue(renderQueue);
+        tr->SetRenderState(&state);
+        tr->SetUseOptimization(useOptimization);
+        tr->SetUseRenderQueue(useRenderQueue);
+        tr->SetVisibilityThreshold(threshold);
+        tr->SetAssumedVisibleFrames(assumedVisibleFrames);
+        tr->SetMaxBatchSize(maxBatchSize);
+        tr->SetUseMultiQueries(useMultiQueries);
+        tr->SetUseTightBounds(useTightBounds);
+        tr->SetUseDepthPass(renderType == RenderState::DEPTH_PASS);
+        tr->SetRenderQueue(renderQueue);
+
+        return tr;
 }
 
@@ -866 +874 @@
         }
         
-        if (showShadowMap && !shadowMap)
-        {
-                const float shadowSize = 4096;
-                shadowMap = new ShadowMap(shadowSize, bvh->GetBox(), camera);
-        }
 
         // render without shading
@@ -908 +911 @@
         case RenderState::DEFERRED:
 
-                // change CHC state (must be done for each change of camera)
-                BvhNode::SetCurrentState(1);
-
-                if (showShadowMap && shadowChanged)
+                if (showShadowMap)// && shadowChanged)
                 {
+                        if (!shadowMap)
+                        {
+                                const float shadowSize = 4096;
+                                shadowMap = new ShadowMap(light, shadowSize, bvh->GetBox(), camera);
+                        }
+
+                        // change CHC state (must be done for each change of camera)
+                        BvhNode::SetCurrentState(1);
+
+                        if (!shadowTraverser)
+                                shadowTraverser = CreateTraverser(shadowMap->GetShadowCamera());
+
                         shadowChanged = false;
 
@@ -921 +933 @@
 
                         // the scene is rendered withouth any shading   
-                        shadowMap->ComputeShadowMap(light, traverser);
+                        shadowMap->ComputeShadowMap(shadowTraverser);
 
                         // change back state
@@ -1073 +1085 @@
         case 32: //space
                 renderMode = (renderMode + 1) % RenderTraverser::NUM_TRAVERSAL_TYPES;
-                ResetTraverser();
+
+                DEL_PTR(traverser);
+                traverser = CreateTraverser(camera);
+
+                if (shadowTraverser && shadowMap) 
+                {
+                        DEL_PTR(shadowTraverser);
+                        //shadowTraverser = CreateTraverser(shadowMap->GetShadowCamera());
+                }
+
                 break;
         case 'h':