Changeset 3112 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Timestamp:

11/09/08 23:06:26 (16 years ago)

Author:

mattausch

Message:

played around with indexing for offset vector, but now choosing different approach: computing offset to old pos in fragment shader!

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/ssao.cg (modified) (6 diffs)

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

@@ -6 +6 @@
 
 #define USE_EYESPACE_DEPTH 1
+//#extension GL_EXT_gpu_shader4 : enable
+
 
 
@@ -130 +132 @@
                                                                 uniform float3 tl,
                                                                 uniform float3 tr, 
+                                                                float3 projPos,
                                                                 float invW,
-                                                                float3 projPos,
-                                                                float4x4 inverseModelTrafo,
+                                                                float4x4 inverseModelTrafos[2],
                                                                 float id,
                                                                 uniform sampler2D noiseTex,
@@ -148 +150 @@
         ////////////
         //-- dynamic objects
-        
+        /*float4x4 dummy;
+        uniform mat4 ident = float4x4(1);
+        x = dot(vec, ident[n]);
+*/
+        float4x4 dummyTrafo = inverseModelTrafos[(int)id];
         //float4x4 trafo = (id < 10.0f) ? oldModelViewProj : mul(oldModelViewProj, inverseModelTrafo);
-        float4x4 trafo = mul(oldModelViewProj, inverseModelTrafo);
+        float4x4 trafo = mul(oldModelViewProj, dummyTrafo);
 
         // compute translational portion
@@ -351 +357 @@
                    uniform float3 oldtr,
                    uniform sampler2D attribsTex,
-                   uniform float4x4 inverseModelTrafo
+                   uniform float4x4 inverseModelTrafos[2]
                    )
 {
@@ -369 +375 @@
         
         float4 projPos = mul(modelViewProj, eyeSpacePos);
-        const float w = 1.0f / projPos.w;
-        projPos *= w;
-        float scaleFactor = SAMPLE_RADIUS * w;
+        const float invw = 1.0f / projPos.w;
+        projPos *= invw;
+        float scaleFactor = SAMPLE_RADIUS * invw;
         
         float2 ao = float2(1.0f, 0);
@@ -387 +393 @@
         OUT.illum_col = temporalSmoothing(eyeSpacePos, eyeSpaceDepth, ao, IN.texCoord, oldEyePos,
                                               oldTex, oldModelViewProj, temporalCoherence,
-                                              colors, w, bl, br, tl, tr, projPos, inverseModelTrafo, id.z,
-                                                                          noiseTex, samples, scaleFactor, oldbl, oldbr, oldtl, oldtr);
+                                              colors, 
+                                                                          bl, br, tl, tr, 
+                                                                          projPos.xyz, 
+                                                                          invw, 
+                                                                          inverseModelTrafos,
+                                                                          id.z,
+                                                                          noiseTex, 
+                                                                          samples, 
+                                                                          scaleFactor, 
+                                                                          oldbl, oldbr, oldtl, oldtr);
 
         //OUT.illum_col.xyz = id;