Changeset 3141 for GTP

Timestamp:

11/18/08 18:23:30 (16 years ago)

Author:

mattausch

Message:

good parameters, transition between filter and no filter not visible (working)

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/combineSsao.cg (modified) (2 diffs)

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

@@ -152 +152 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        //if ((ao.y < 60.0f) && (col.w < 1e10f))
-        if (col.w < 1e10f)
+        if ((ao.y < 70.0f) && (col.w < 1e10f))
+        //if (col.w < 1e10f)
         {
-                const float xoffs = 20.0f / 1024.0f;
-                const float yoffs = 20.0f / 768.0f;
-
-                /*float3 b2 = tex2Dlod(offsetTex, float4(IN.texCoord + float2(xoffs, 0), 0, 0)).xyz;
-                float3 b3 = tex2Dlod(offsetTex, float4(IN.texCoord + float2(0, yoffs), 0, 0)).xyz;
-                float3 b4 = tex2Dlod(offsetTex, float4(IN.texCoord + float2(-xoffs, 0), 0, 0)).xyz;
-                float3 b5 = tex2Dlod(offsetTex, float4(IN.texCoord + float2(0, -yoffs), 0, 0)).xyz;
-
-                float border = step(0.001f,  b2
-                //float3 id = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
-*/
-                
-                /*float3 x2 = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(xoffs, 0), 0, 0)).xyz;
-                float3 x3 = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(0, yoffs), 0, 0)).xyz;
-                float3 x4 = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(-xoffs, 0), 0, 0)).xyz;
-                float3 x5 = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(0, -yoffs), 0, 0)).xyz;
-
-                //ao.x = (ao.x + x2 + x3 + x4 + x5) * 0.2f;
-                if (ao.y < 1.5f)
-                ao.x = (x2 + x3 + x4 + x5) * 0.25f;
-
-*/
-                const static float scaleFactor = 1.0f;
-                //const static float scaleFactor = 10.0f;
-                const static float adaptFactor = 50000.0f;
+                const float scaleFactor = 1.0f;
+                const float adaptFactor = 10.0f;
 
                 //ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
@@ -186 +163 @@
                 //ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, adaptFactor * scaleFactor  / (adaptFactor + ao.y), 0);
 
-                //if (ao.y < 50.5f) ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, adaptFactor * scaleFactor * ao.z  / (adaptFactor + ao.y), bl, br, tl, tr);
-                if (ao.y < 50.5f) ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, ao.z, bl, br, tl, tr);
+                const float scale =     adaptFactor * scaleFactor * ao.z  / (adaptFactor + ao.y);
+
+                ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, scale, bl, br, tl, tr);
+                //if (ao.y < 50.5f) ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, ao.z, bl, br, tl, tr);
                 //ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, 1, 0);
         }