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

Timestamp:

10/05/08 23:13:58 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• deferred.cg (modified) (3 diffs)
• mrt.cg (modified) (3 diffs)
• sky_preetham.cg (modified) (2 diffs)
• ssao.cg (modified) (3 diffs)
• tonemap.cg (modified) (2 diffs)

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

@@ -48 +48 @@
         float4 outColor;
 
-        if (position.w > 1e19f) outColor = color;
+        // hack: prevent shading the sky
+        if (position.z > 1e19f) outColor = color;
         //if (emmisive > 1.5f) outColor = color;
         else outColor = (ambient + diffuse) * color;
 
         return outColor;
-        //return saturate((((ambient + diffuse)) * (1.0f - emmisive) + emmisive) * color);
 }
 
@@ -188 +188 @@
         // calc diffuse illumination + shadow term
         //if ((emmisive < 1.5f) // hack: prevent shadowing the sky      
-        if (
-                (position.w < 1e19f)
+        if ((position.z < 1e19f)
                 && (angle > 1e-3f) // shadow only if diffuse color has some minimum intensity
                 )
@@ -209 +208 @@
         // base lighting
         //OUT.color = (emmisive > 1.5f) ? color: (ambient + diffuse) * color;
-        OUT.color = (position.w > 1e19f) ? color: (ambient + diffuse) * color;
+        OUT.color = (position.z > 1e19f) ? color: (ambient + diffuse) * color;
 
 

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

@@ -37 +37 @@
 struct pixel
 {
-  float4 col: COLOR0;
-  //float4 pos: COLOR1;
-  float4 pos: COLOR1;
-  float4 norm: COLOR2;
+        float4 col: COLOR0;
+        //float4 pos: COLOR1;
+        float3 pos: COLOR1;
+        float4 norm: COLOR2;
 };
 
@@ -113 +113 @@
         pix.col.w = length(eyePos - IN.worldPos.xyz) * maxDepth / magView;
 
+#if 1
         // save world position in second render target
-        pix.pos = IN.worldPos * maxDepth;
-        // store the projected depth
-        pix.pos.w = projPos.z;
+        pix.pos = IN.worldPos.xyz * maxDepth;
+#endif
 
         return pix;
@@ -150 +150 @@
         pix.col.w = length(eyePos - IN.worldPos.xyz) * maxDepth / magView;
 
-        pix.pos = IN.worldPos * maxDepth;
-        // store the projected depth
-        pix.pos.w = projPos.z;
+#if 1
+        pix.pos = IN.worldPos.xyz * maxDepth;
+#endif
 
         return pix;

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

@@ -31 +31 @@
 {
   float4 col: COLOR0;
-  float4 pos: COLOR1;
+  float3 pos: COLOR1;
   float4 norm: COLOR2;
 };
@@ -112 +112 @@
 
         pix.col = IN.color2;
-        pix.pos = 1e20f;
+        pix.col.w = 2.0f;
 
         pix.norm.xyz = IN.normal;
+        pix.norm.w = IN.mypos.w;
+
+        pix.pos = 1e20f;
         
-        pix.norm.w = IN.mypos.w;
-        pix.pos.w = 1e20f;
-        
-        pix.col.w = 2.0f;
-
         return pix;
 }

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

@@ -170 +170 @@
 
 
-        // the current world position
-        const float4 centerPosition = tex2D(positions, IN.texCoord.xy);
-
 #if USE_EYE_SPACE_DEPTH
         /// reconstruct position from the eye space depth
         float3 viewDir = IN.view;
         const float eyeDepth = tex2D(colors, IN.texCoord.xy).w;
-        float4 centerPosition2;
-
-        centerPosition2.xyz = eyePos - viewDir * eyeDepth;
-        centerPosition2.w = centerPosition.w;
-
-        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition2, w, eyePos, bl, br, tl, tr);
+
+        float4 centerPosition;
+        centerPosition.xyz = eyePos - viewDir * eyeDepth;
+        centerPosition.w = centerPosition.w;
+
+        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
 #else
 
+        // the current world position
+        const float4 centerPosition = tex2D(positions, IN.texCoord.xy);
+
         const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
 
 #endif
 
-        // get the current depth
+        /////////////////
+        //-- compute temporally smoothing
+
+        float4 realPos = centerPosition * maxDepth;
+        realPos.w = 1.0f;
+
+        // calulcate the current depth
         //const float currentDepth = centerPosition.w;
         
@@ -198 +204 @@
         
 
-        /////////////////
-        //-- compute temporally smoothing
-
-        float4 realPos = centerPosition * maxDepth;
-        realPos.w = 1.0f;
-
-
         ///////////
         //-- reprojection new frame into old one 
@@ -210 +209 @@
         // calculate projected depth
         float4 projPos = mul(oldModelViewProj, realPos);
-        projPos /= oldPos.w;
+        projPos /= projPos.w;
 
         // the current depth projected into the old frame

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

@@ -22 +22 @@
 float4 DownSample(frag IN,
                                   uniform sampler2D colors,
-                                  float2 downSampleOffs[4]) : COLOR
+                                  uniform float2 downSampleOffs[4]): COLOR
 {    
     float4 average = .0f;
@@ -130 +130 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        if (oldLogLum > 1e-5f) // too hight log lum
+        if (oldLogLum > 1e-5f) // too bright
                 OUT.col.w = lerp(oldLogLum, logLumScaled, 0.1f);
         else