Changeset 3353

Timestamp:

04/14/09 13:53:30 (16 years ago)

Author:

mattausch

Message:

something strange happening in sibenik: reprojection not working!!

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• src/chcdemo.cpp (modified) (5 diffs)
• src/shaderenv.h (modified) (1 diff)
• src/shaders/combineSsaoSep.cg (modified) (1 diff)
• src/shaders/deferred.cg (modified) (3 diffs)
• src/shaders/ssao.cg (modified) (2 diffs)
• vienna.env (modified) (1 diff)

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

@@ -557 +557 @@
 
         visCamera = new PerspectiveCamera(winWidth / winHeight, fov);
-        visCamera->SetNear(0.0f);
+        visCamera->SetNear(.0f);
         visCamera->Yaw(.5 * M_PI);
 
@@ -633 +633 @@
         if (0) LoadPompeiiFloor();
 
-#if 1
 
 #if 0
@@ -670 +669 @@
         }
 
-#endif
+        const float rotAngle = M_PI / 180.0f;
+        const Matrix4x4 rotMatrix = RotationZMatrix(rotAngle);
+        // hack: second buddha
+        //dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
 
         
@@ -1164 +1166 @@
 #endif
 
+#if 0
                 /////////////////////////
                 //-- update animations
@@ -1185 +1188 @@
                 const float moveSpeed = 1e-1f;
                 motionPath->Move(moveSpeed);
+#endif
         }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -31 +31 @@
 
 //#define MIN_DEPTH_DIFF 5e-3f
-#define MIN_DEPTH_DIFF 1e-3f
+//#define MIN_DEPTH_DIFF 1e-3f
+#define MIN_DEPTH_DIFF 1e-9f
 #define DYNAMIC_OBJECTS_THRESHOLD 1e-8f
 

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

@@ -241 +241 @@
         if (depth < DEPTH_THRESHOLD)
         {
-                OUT.illum_col.xyz = col.xyz * max(minAO, 1.0f - ao.x);
+                //OUT.illum_col.xyz = col.xyz * max(minAO, 1.0f - ao.x);
+                OUT.illum_col.xyz = max(minAO, 1.0f - ao.x);
                 //OUT.illum_col.xyz = max(minAO, 1.0f - ao.x);
         }

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

@@ -40 +40 @@
 
         // hack: prevent to shade the sky
+#if 0
         if (color.w > DEPTH_THRESHOLD)
         {
@@ -51 +52 @@
                         outColor = (ambient + diffuse) * color;
         }
+#else
+        outColor = ao;
+#endif
 
         return outColor;
@@ -361 +365 @@
                                                                          );
 #else
-        const float2 pValid = float2(0,0);
+        const float2 pValid = float2(0, 0);
 #endif
 

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

@@ -522 +522 @@
         
         float oldWeight = temporalVals.y;
-        float oldIdx = temporalCoherence > 1 ? temporalVals.z : 0;
+        //float oldIdx = temporalCoherence > 1 ? temporalVals.z : 0;
+        float oldIdx = temporalVals.z;
         
 #else
@@ -602 +603 @@
         OUT.illum_col.w = eyeSpaceDepth;
 
-        //if (OUT.illum_col.z > 1000) OUT.illum_col.z = 0;
-
         // this value can be used to check if this pixel belongs to a moving object
         OUT.col.x = SqrLen(diffVec);

GTP/trunk/App/Demos/Vis/FriendlyCulling/vienna.env

@@ -66 +66 @@
 lightDirection=0.556361 0.559966 -0.613923
 
+
 #####################
 ## window options