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

Timestamp:

11/07/08 16:40:53 (16 years ago)

Author:

mattausch

Message:

worked on id for dynamic objects

Location:

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

Files:

• mrt.cg (modified) (3 diffs)
• sky_preetham.cg (modified) (4 diffs)
• ssao.cg (modified) (5 diffs)

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

@@ -38 +38 @@
         float4 col: COLOR0;
         float3 norm: COLOR1;
-        float3 pos: COLOR2;
+        float3 id: COLOR2;
 };
 
@@ -83 +83 @@
         // compute eye linear depth
         pix.col.w = length(IN.eyePos.xyz);
-        // hack: squeeze some information about ambient into the texture
-        //pix.col.w = glstate.material.emission.x;
+        // the scene entity id
+        pix.id = glstate.fog.color.xyz;
+        //pix.id = float3(1,1,1);
 
         return pix;
@@ -101 +102 @@
         // eye space depth
         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;
-
+        // the scene entity id
+        pix.id = glstate.fog.color.xyz;
+        
         return pix;
 }

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

@@ -37 +37 @@
         float4 col: COLOR0;
         float3 norm: COLOR1;
-        float3 pos: COLOR2;
+        float3 id: COLOR2;
 };
 
@@ -83 +83 @@
                               0.055648f, -0.204043f,  1.057311f);
 
-        float3 hcol = mul(conv_Mat, XYZ);
-        OUT.color = float4(hcol, 1.0f);
+        //float3 hcol = mul(conv_Mat, XYZ);
+        //OUT.color = float4(hcol, 1.0f);
+        OUT.color = float4(mul(conv_Mat, XYZ), 1.0f);
 
         OUT.color.rgb *= multiplier;
@@ -91 +92 @@
 
         OUT.normal = IN.normal;
-
+        
         return OUT;
 }
@@ -103 +104 @@
         pix.col.w = 1e20f;
         pix.norm = IN.normal;
-        
+        // the scene entity id
+        pix.id = glstate.fog.color.xyz;
+
         return pix;
 }

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

@@ -150 +150 @@
         float4x4 trafo;
         
-        if (id > 20) trafo = oldModelViewProj;
-        else trafo = inverseModelTrafo * oldModelViewProj;
+        if (id < 10) 
+                trafo = oldModelViewProj;
+        else 
+                trafo = inverseModelTrafo * oldModelViewProj;
 
         // compute translational portion
@@ -350 +352 @@
                    uniform float3 oldtl,
                    uniform float3 oldtr,
-                   uniform sampler2D attribs,
+                   uniform sampler2D attribsTex,
                    uniform float4x4 inverseModelTrafo
                    )
@@ -383 +385 @@
         //-- compute temporally smoothing
 
-        float id = tex2Dlod(attribs, float4(IN.texCoord, 0, 0)).x;
+        float3 id = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
 
         OUT.illum_col = temporalSmoothing(eyeSpacePos, eyeSpaceDepth, ao, IN.texCoord, oldEyePos,
                                               oldTex, oldModelViewProj, temporalCoherence,
-                                              colors, w, bl, br, tl, tr, projPos, inverseModelTrafo, id,
+                                              colors, w, bl, br, tl, tr, projPos, inverseModelTrafo, id.z,
                                                                           noiseTex, samples, scaleFactor, oldbl, oldbr, oldtl, oldtr);
 
+        //OUT.illum_col.xyz = id;
         //OUT.illum_col.xyz = normal * 0.5f + 0.5f;
         return OUT;
@@ -405 +408 @@
 
         for (int i = 0; i < NUM_SSAO_FILTERSAMPLES; ++ i)
-        {
+        {       
                 average += filterWeights[i] * tex2Dlod(ssaoTex, float4(texCoord + filterOffs[i] * scale, 0, 0)).x;
                 w += filterWeights[i];
@@ -428 +431 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        if ((ao.y < 10.0f) && (col.w < 1e10f))
-                ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights, 1.0f / (1.0f + ao.y));//ao.z);
-
-        OUT.illum_col = col * ao.x;
+        //if ((ao.y < 10.0f) && (col.w < 1e10f))
+        //      ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights, 1.0f / (1.0f + ao.y));//ao.z);
+
+        //OUT.illum_col = col * ao.x;
         //OUT.illum_col = float4(ao.y, ao.y, ao.y, col.w);
-        //OUT.illum_col = float4(ao.x, ao.x, ao.x, col.w);
+        //OUT.illum_col = float4(ao.x, ao.y, ao.z, col.w);
+        OUT.illum_col = float4(ao.x, ao.x, ao.x, col.w);
         //OUT.illum_col.xyz = float3(1.0f - ao.x, 1.0f - ao.y * 1e-2f, 1);
         //OUT.illum_col.xyz = float3(1.0f - ao.x, ao.y, 0);