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

Timestamp:

11/11/08 12:18:07 (16 years ago)

Author:

mattausch

Message:

strange errors

Location:

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

Files:

• mrt.cg (modified) (3 diffs)
• ssao.cg (modified) (6 diffs)

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

@@ -16 +16 @@
 
         float4 color: COLOR0;  
-        float4 eyePos: TEXCOORD1; // eye position
+         // eye position
+        float4 eyePos: TEXCOORD1;
         float4 normal: TEXCOORD2;
         float4 worldPos: TEXCOORD3;
@@ -30 +31 @@
 
         float4 winPos: WPOS;
-        float4 eyePos: TEXCOORD1; // eye position
+        // eye position
+        float4 eyePos: TEXCOORD1;
         float4 normal: TEXCOORD2;
         float4 worldPos: TEXCOORD3;
@@ -61 +63 @@
         // transform the vertex position into post projection space
         OUT.position = mul(glstate.matrix.mvp, IN.position);
-
         // the normal has to be correctly transformed with the inverse transpose
         OUT.normal = mul(glstate.matrix.invtrans.modelview[0], IN.normal);
-
         // transform the old vertex position into world space
         OUT.worldPos = mul(modelMatrix, IN.position);

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

@@ -177 +177 @@
 
 #else
+
         // calculate eye space position of sample in old frame
         const float oldDepth = oldPixel.w;
@@ -182 +183 @@
         // vector from eye pos to old sample 
         const float depthDif = abs(projectedDepth - oldDepth);
+
 #endif
 
@@ -210 +212 @@
         }
 
-
-        // the number of valid samples in this frame
-        //const float newNumSamples = ao.y;
-        //const float oldNumSamples = oldCol.y;
-
         const float oldWeight = clamp(oldPixel.y, .0f, temporalCoherence);
         float newWeight;
@@ -256 +253 @@
 */
 float2 ssao(fragment IN,
-                        uniform sampler2D colors,
-                        uniform sampler2D noiseTex,
-                        uniform float2 samples[NUM_SAMPLES],
-                        uniform float3 normal,
-                        uniform float3 centerPosition,
-                        uniform float scaleFactor,
-                        uniform float3 bl,
-                        uniform float3 br,
-                        uniform float3 tl,
-                        uniform float3 tr, 
-                        uniform float3 viewDir
+                        sampler2D colors,
+                        sampler2D noiseTex,
+                        float2 samples[NUM_SAMPLES],
+                        float3 normal,
+                        float3 centerPosition,
+                        float scaleFactor,
+                        float3 bl,
+                        float3 br,
+                        float3 tl,
+                        float3 tr, 
+                        float3 viewDir
+                        //,float2 noiseOffs
                         )
 {
@@ -285 +283 @@
                 //-- add random noise: reflect around random normal vector (rather slow!)
 
+                //float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f + noiseOffs, 0, 0)).xy;
                 float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
                 const float2 offsetTransformed = myreflect(offset, mynoise);
@@ -374 +373 @@
         {
                 ao = ssao(IN, colors, noiseTex, samples, normal, 
-                          eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir));
+                          eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir));//, noiseOffs);
         }