Changeset 3354

Timestamp:

04/14/09 17:20:50 (16 years ago)

Author:

mattausch

Message:

indexing not working right ....

Location:

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

Files:

• SampleGenerator.cpp (modified) (1 diff)
• shaderenv.h (modified) (2 diffs)
• shaders/combineSsaoSep.cg (modified) (2 diffs)
• shaders/ssao.cg (modified) (7 diffs)

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

@@ -248 +248 @@
         for (int i = 0; i < mNumSamples; ++ i)
         {
-                //x[0] = RandomValue(0, 1); x[1] = RandomValue(0, 1);
-                mHalton->GetNext(x);
+                x[0] = RandomValue(0, 1); x[1] = RandomValue(0, 1);
+                //mHalton->GetNext(x);
                 
                 const float a = 2.0f * M_PI * x[0];

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

@@ -11 +11 @@
 //#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
-#define NUM_SAMPLES 32
+#define NUM_SAMPLES 8
 
 //#define MIN_SAMPLES 48
@@ -32 +32 @@
 //#define MIN_DEPTH_DIFF 5e-3f
 //#define MIN_DEPTH_DIFF 1e-3f
-#define MIN_DEPTH_DIFF 1e-9f
+#define MIN_DEPTH_DIFF 1e-3f
 #define DYNAMIC_OBJECTS_THRESHOLD 1e-8f
 

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

@@ -194 +194 @@
         }
 
-
         return OUT;
 }
@@ -251 +250 @@
 
         //OUT.illum_col.xyz = float3(ao.w * 5e-1f, 0, 0);
-        //OUT.illum_col.xyz = float3(ao.z * 1e-1f);
-        //OUT.illum_col.xyz = float3(ao.y * 1e-1f);//, 0, 0);
+        //OUT.illum_col.xyz = float3(ao.z * 1e-3f);
+        //OUT.illum_col.xyz = float3(ao.y * 1e-3f);x
         //OUT.illum_col.xyz = ao.xyz;
 

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

@@ -148 +148 @@
                 
                 //w = ComputeConvergence(oldTex, oldTexCoords, float2(1024.0f, 768.0f));
-                w = oldPixel.y;
+                w   = oldPixel.y;
                 idx = floor(oldPixel.z);
-
+                //idx = oldPixel.z;
         }
         else
         {       
-                w = 0.0f;
+                w   = .0f;
                 idx = .0f;
         }
@@ -346 +346 @@
                 const float2 ssaoOffset = 
                         tex2Dlod(samples, float4((0.5f + i + oldIdx) / NUM_PRECOMPUTED_SAMPLES, 0.5f, .0f, .0f)).xy;
+
 
                 ////////////////////
@@ -500 +501 @@
         
 #ifdef PERFORMANCE_TEST 
-
+//#if 0
         float3 diffVec = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
 
@@ -522 +523 @@
         
         float oldWeight = temporalVals.y;
-        //float oldIdx = temporalCoherence > 1 ? temporalVals.z : 0;
-        float oldIdx = temporalVals.z;
+        float oldIdx = temporalCoherence > 1 ? temporalVals.z : 0;
+        //float oldIdx = temporalVals.z;
         
 #else
 
+        const float3 diffVec = float3(.0f);
         const bool isMovingObject = false;
         const float oldSsao = 0;
         
         float oldWeight = 0;
-        float oldIdx = 0;
+        float oldIdx    = 0;
         
 #endif
@@ -555 +557 @@
         else
         {
-                 ao = float3(1.0f, 1.0f, 1.0f);
+                 ao = float3(1.0f);
         }
 
@@ -579 +581 @@
                 {
                         oldWeight = .0f;
-                        oldIdx = .0f;
+                        oldIdx    = .0f;
                 }
                 else if (ao.y > partlyResetThres)
@@ -585 +587 @@
                         oldWeight = min(oldWeight, 4.0f * newWeight);
                         //oldWeight = .0f; 
-                        //oldIdx = .0f;
+                        //oldIdx    = .0f;
                 }
         }