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

Timestamp:

10/01/08 16:44:23 (16 years ago)

Author:

mattausch

Message:

debug version trying to retrieve position from linear eye space depth

Location:

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

Files:

• deferred.cg (modified) (2 diffs)
• ssao.cg (modified) (7 diffs)

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

@@ -83 +83 @@
         OUT.color = col;
 
-OUT.color.w = color.w;
-
+        OUT.color.xyz = color.w / 1e3f;
+        
+#if 1
+
+        OUT.color.w = color.w;
+
+#else
 
         ////////////
         //-- write out logaritmic luminance for tone mapping
-/*
+
         float4 oldColor = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL));
 
@@ -103 +108 @@
         else
                 OUT.color.w = logLumScaled;
-*/
+
+#endif
+
         return OUT;
 }

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

@@ -32 +32 @@
 
 
+float3 RotateY(float3 v, float a)
+{
+        float3 r;
+
+        r.z = v.z * cos(a) - v.x * sin(a);
+        r.x = v.z * sin(a) + v.x * cos(a);
+        r.y = v.y;
+
+        return r;
+}
+
+
+float3 RotateX(float3 v, float a)
+{
+        float3 r;
+
+        r.y = v.y * cos(a) - v.z * sin(a);
+        r.z = v.y * sin(a) + v.z * cos(a);
+        r.x = v.x;
+
+        return r;
+}
 
 /** The ssao shader returning the an intensity value between 0 and 1
@@ -43 +65 @@
                    uniform float scaleFactor,
                    uniform float3 viewDir,
-                   uniform float3 eyePos
+                   uniform float3 eyePos,
+                   uniform sampler2D positions,
+                   uniform float3 bl,
+                   uniform float3 br,
+                   uniform float3 tl,
+                   uniform float3 tr
                    )
 {
@@ -52 +79 @@
         float total_ao = 0.0;
         float numSamples = 0;
+
+        const float y_angle = 0.43633231299858239423092269212215;
+        const float x_angle = 0.58177641733144319230789692282954;
 
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
@@ -75 +105 @@
                 float eyeSpaceDepth = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).w;
 
-                float3 sample_position = eyePos - viewDir * eyeSpaceDepth; 
-                
+                float rotx = offsetTransformed.x * -x_angle;
+                float roty = offsetTransformed.y * -y_angle;
+
+                float3 rotView_x = RotateY(viewDir, x_angle);
+                float3 rotView = RotateX(rotView_x, y_angle);
+
+                float3 sample_position = eyePos - rotView * eyeSpaceDepth;
+                //float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
 
                 float3 vector_to_sample = sample_position - centerPosition.xyz;
@@ -117 +153 @@
                    uniform float maxDepth,
                    uniform float temporalCoherence,
-                   uniform float3 eyePos
+                   uniform float3 eyePos,
+                   uniform float3 bl,
+                   uniform float3 br,
+                   uniform float3 tl,
+                   uniform float3 tr
                    )
 {
@@ -137 +177 @@
         float3 viewDir = normalize(IN.view);
 
-        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, viewDir, eyePos);
+        /*const float eyeSpaceDepth = tex2D(colors, IN.texCoord.xy).w;
+
+        float3 sample_position = eyePos - viewDir * eyeSpaceDepth; 
+
+        OUT.illum_col.xyz = centerPosition.xyz - sample_position;
+        OUT.illum_col.w = currentDepth;
+        return OUT;*/
+
+        //const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, viewDir, eyePos);
+        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, viewDir, eyePos, positions,
+                uniform float3 bl,
+                uniform float3 br,
+                uniform float3 tl,
+                uniform float3 tr);
                 
 
@@ -206 +259 @@
         float4 ao = tex2D(ssaoTex, IN.texCoord.xy);
 
-        OUT.illum_col = col * ao.x;
-        //OUT.illum_col.w = ao.w;
+        //OUT.illum_col = col * ao.x;
+        OUT.illum_col = float4(ao.x,ao.x,ao.x, ao.w);
         OUT.illum_col.w = col.w;