Changeset 3125

Timestamp:

11/13/08 13:14:55 (16 years ago)

Author:

mattausch

Message:

changed tm so no values out of bounds, somehow occlusion error missing again

Location:

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

Files:

• Bvh.cpp (modified) (3 diffs)
• chcdemo.cpp (modified) (6 diffs)
• shaders/ssao.cg (modified) (1 diff)
• shaders/tonemap.cg (modified) (4 diffs)

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

@@ -201 +201 @@
                 mGeometry[mStaticGeometrySize + i] = dynamicEntities[i];
         }
+
+        cout << "max depth for testing children" << mMaxDepthForTestingChildren << endl;
 }
 
@@ -227 +229 @@
 
         mMaxDepthForTestingChildren = maxDepthForTestingChildren;
+        cout << "max depth for testing children" << mMaxDepthForTestingChildren << endl;
 }
 
@@ -592 +595 @@
         return numNodes;
 }
-
-#if TODO
-void Bvh::RenderBoundsImmediate(const BvhNodeContainer &nodes, RenderState *state)
-{
-        /////////
-        //-- Render the tight bounds in immediate mode
-        BvhNodeContainer::const_iterator nit, nit_end = nodes.end();
-
-        for (nit = nodes.begin(); nit != nit_end; ++ nit)
-        {
-                BvhNode *node = *nit;
-
-                for (int size_t i = 0; i < node->mNumTestNodes; ++ i)
-                {
-                        BvhNode *testNode = node->mTestNodesIdx
-                        RenderBoundingBoxImmediate((*nit)->GetBox());
-                }
-        }
-}
-#endif
 
 

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

@@ -472 +472 @@
 
         //LoadModel("fisch.dem", dynamicObjects);
-        /*LoadModel("hbuddha.dem", dynamicObjects);
+        LoadModel("hbuddha.dem", dynamicObjects);
         buddha = dynamicObjects.back();
         
@@ -497 +497 @@
                 ent->SetTransform(transform);
                 dynamicObjects.push_back(ent);
-        }*/
+        }
 
 
@@ -913 +913 @@
 void MainLoop() 
 {       
-#if 0
+#if 1
         GPUProgramParameters *vtxParams = 
                 buddha->GetShape(0)->GetMaterial()->GetTechnique(1)->GetVertexProgramParameters();
@@ -930 +930 @@
                 if (GetOrCreateSceneQuery()->CalcIntersection(newPos))
                 {
-                        Matrix4x4 mat = TranslationMatrix(newPos - ent->GetCenter());// + Vector3(0, 0, ent->GetBoundingBox().Size(2) * 0.5f));
+                        Matrix4x4 mat = TranslationMatrix(newPos - ent->GetCenter());
                         ent->GetTransform()->SetMatrix(mat);
                 }
@@ -937 +937 @@
         Matrix4x4 rotMatrix = RotationZMatrix(M_PI * 1e-3f);
         dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
+
+
+        /////////////////////////
+        //-- update animations
+        
+        motionPath->Move(0.01f);
+
 #endif
 
@@ -1164 +1171 @@
 
         glutSwapBuffers();
-
-
-        /////////////////////////
-        //-- update animations
-        motionPath->Move(0.01f);
 }
 

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

@@ -174 +174 @@
         // calculate eye space position of sample in old frame
         const float oldDepth = oldPixel.w;
+        // the depth projected into the old frame
         const float projectedDepth = projPos.z;
-        // vector from eye pos to old sample 
+        // calculate depth difference 
         const float depthDif = abs(projectedDepth - oldDepth);
 

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

@@ -19 +19 @@
 };
 
-
-/*float4 DownSample(frag IN,
-                                  uniform sampler2D colors,
-                                  uniform float2 downSampleOffs[9]): COLOR
-{    
-    float4 average = .0f;
-
-        const float4 avgColor = tex2Dlod(colors, float4(IN.texCoord, 0, 0));
-
-        float j = 0;
-        float4 color;
-
-    for (int i = 0; i < 9; ++ i)
-    {
-                color = tex2Dlod(colors, float4(IN.texCoord + downSampleOffs[i], 0, 0));
-                if (abs(color.w - avgColor.w) < 1e-3f)
-                {
-                        average += color;
-                        ++ j;
-                }
-    }
-        
-    //average *= 1.0f / 9.0f;
-    average *= 1.0f / j;
-
-    return average;
-}*/
  
 
-// let bilinear filtering do its work
 float4 DownSample(frag IN,
                                   uniform sampler2D colors,
                                   uniform float2 downSampleOffs[NUM_DOWNSAMPLES]): COLOR
 {    
+        // let bilinear filtering do its work
         return tex2Dlod(colors, float4(IN.texCoord, 0, 0));
 /*
@@ -71 +44 @@
         intensity.
 */
-
 float4 GreyScaleDownSample(frag IN,
                                                    uniform sampler2D colors,
@@ -148 +120 @@
         float logLum = logLumScaled * LOGLUM_RANGE + MINLOGLUM;
 
-        float newImageKey = exp(logLum);
+        float newImageKey = max(exp(logLum), 1e-6f);
 
         // adjust to middle gray
@@ -184 +156 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
+        const float expFactor = 0.1f;
         // exponential smoothing of tone mapping over time
-        if (oldLogLum > 1e-5f) // loglum from last frame too bright
-                OUT.col.w = lerp(oldLogLum, logLumScaled, 0.1f);
+        if (oldLogLum > 1e-5f) // check if loglum from last frame too small (=> tm too bright)
+                OUT.col.w = lerp(oldLogLum, logLumScaled, expFactor);
         else
                 OUT.col.w = logLumScaled;