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

Timestamp:

10/16/08 19:51:16 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• deferred.cg (modified) (2 diffs)
• globillum.cg (modified) (3 diffs)
• mrt.cg (modified) (8 diffs)
• ssao.cg (modified) (3 diffs)

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

@@ -175 +175 @@
         const float eyeDepth = tex2Dlod(colors, float4(IN.texCoord, 0, 0)).w;
 
-        float4 position;
-        position.xyz = eyePos - viewDir * eyeDepth;
-        
+        const float4 worldPos = float4(eyePos - viewDir * eyeDepth, 1);
         
         // diffuse intensity
@@ -193 +191 @@
                 )
         {
-                position.w = 1.0f;
-
-                float4 lightSpacePos = mul(shadowMatrix, position);
+                float4 lightSpacePos = mul(shadowMatrix, worldPos);
                 lightSpacePos /= lightSpacePos.w;
 

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

@@ -179 +179 @@
         const float3 eyeSpacePos = -viewDir * eyeDepth;
 
-        const float3 centerPosition = eyePos + eyeSpacePos;
-        const float4 realPos = float4(centerPosition, 1.0f);
+        const float4 worldPos = float4(eyePos + eyeSpacePos, 1.0f);
 
         // calculcate the current projected depth for next frame
-        float4 currentPos = mul(modelViewProj, realPos);
+        float4 currentPos = mul(modelViewProj, worldPos);
+
         const float w = SAMPLE_RADIUS / currentPos.w;
         currentPos /= currentPos.w;
+        
         const float currentDepth = currentPos.z * 1e-3f;
 
@@ -197 +198 @@
         //-- compute temporally smoothing
 
-        
         // reprojection new frame into old one 
         // calculate projected depth
-        float4 projPos = mul(oldModelViewProj, realPos);
+        float4 projPos = mul(oldModelViewProj, worldPos);
         projPos /= projPos.w;
 
@@ -210 +210 @@
 
         // retrieve the sample from the last frame
-        float3 oldSsao = tex2D(oldSsaoTex, tex);
-        float3 oldIllum = tex2D(oldIllumTex, tex);
+        float3 oldSsao = tex2D(oldSsaoTex, tex).xyz;
+        float3 oldIllum = tex2D(oldIllumTex, tex).xyz;
 
         const float oldDepth = oldSsao.z;

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

@@ -15 +15 @@
 
   float4 color: COLOR0;  
-  float4 worldPos: TEXCOORD1; // world position
+  float4 eyePos: TEXCOORD1; // eye position
   float3 normal: TEXCOORD2;
 };
@@ -24 +24 @@
 {
         float4 color: COLOR0;  
-        float4 position: POSITION; // eye space
+        //float4 position: POSITION;
         float4 texCoord: TEXCOORD0;    
 
         float4 winPos: WPOS;
-        float4 worldPos: TEXCOORD1; // world position
+        float4 eyePos: TEXCOORD1; // eye position
         float3 normal: TEXCOORD2;
 };
@@ -40 +40 @@
 };
 
+
 #pragma position_invariant vtx
 
-vtxout vtx(vtxin IN, 
-                   uniform float4x4 modelView)
+vtxout vtx(vtxin IN)
 {
         vtxout OUT;
@@ -50 +50 @@
         OUT.texCoord = IN.texCoord;
 
-        //OUT.worldPos = mul(glstate.matrix.inverse.projection, OUT.position);
-        OUT.worldPos = mul(modelView, IN.position);
         // transform the vertex position into eye space
+        OUT.eyePos = mul(glstate.matrix.modelview[0], IN.position);
+        // transform the vertex position into post projection space
         OUT.position = mul(glstate.matrix.mvp, IN.position);
 
@@ -60 +60 @@
 }
 
-
-// bilinear interpolation
-inline float3 Interpol(float2 w, float3 bl, float3 br, float3 tl, float3 tr)
-{
-        float3 x1 = lerp(bl, tl, w.y);
-        float3 x2 = lerp(br, tr, w.y); 
-        float3 v = lerp(x1, x2, w.x); 
-
-        return v;
-}
-
 //#pragma position_invariant fragtex
 
 pixel fragtex(fragin IN, 
-                          uniform sampler2D tex,
-                          uniform float3 eyePos,
-                          uniform float3 bl,
-                          uniform float3 br,
-                          uniform float3 tl,
-                          uniform float3 tr
+                          uniform sampler2D tex
                           )
 {
@@ -99 +83 @@
 
         // compute eye linear depth
-        pix.col.w = length(eyePos - IN.worldPos.xyz);
+        pix.col.w = length(IN.eyePos.xyz);
 
         return pix;
@@ -105 +89 @@
 
 
-pixel frag(fragin IN, 
-                   uniform float3 eyePos,
-                   uniform float3 bl,
-                   uniform float3 br,
-                   uniform float3 tl,
-                   uniform float3 tr)
+pixel frag(fragin IN)
 {
         pixel pix;
@@ -119 +98 @@
         pix.norm = IN.normal;
 
+        pix.col.w = length(IN.eyePos.xyz);
+
         // hack: squeeze some information about the ambient term into the target
         //pix.col.w = glstate.material.emission.x;
-        pix.col.w = length(eyePos - IN.worldPos.xyz);
 
         return pix;

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

@@ -159 +159 @@
         const float eyeDepth = tex2Dlod(colors, float4(IN.texCoord, 0, 0)).w;
         const float3 eyeSpacePos = -viewDir * eyeDepth;
-        const float3 centerPosition = eyePos + eyeSpacePos;
-
-        const float4 realPos = float4(centerPosition, 1.0f);
+        const float4 worldPos = float4(eyePos + eyeSpacePos, 1.0f);
 
 
@@ -167 +165 @@
         //-- calculcate the current projected depth for next frame
         
-        float4 currentPos = mul(modelViewProj, realPos);
+        float4 currentPos = mul(modelViewProj, worldPos);
         
         const float w = SAMPLE_RADIUS / currentPos.w;
@@ -185 +183 @@
         
         // calculate projected depth
-        float4 projPos = mul(oldModelViewProj, realPos);
+        float4 projPos = mul(oldModelViewProj, worldPos);
         projPos /= projPos.w;
-
+        
         // the current depth projected into the old frame
         const float projDepth = projPos.z * precisionScale;