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

Timestamp:

07/04/08 00:51:25 (16 years ago)

Author:

mattausch

Message:

ssao working ok

Location:

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

Files:

• deferred.cg (modified) (6 diffs)
• mrt.cg (modified) (2 diffs)

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

@@ -67 +67 @@
 
   //const float areaSize = 4.0f;  
-  const float areaSize = 4e-3f;
-  const float sampleIntensity = 0.1f;
+  const float areaSize = 5e-1f;
+  //const float areaSize = 1e-4f;
+  const float sampleIntensity = 0.2f;
   
   for (int i = 0; i < SAMPLES; i ++) {
@@ -76 +77 @@
     float3 noise = tex2D(noiseTexture, IN.texCoord.xy).xyz * 2.0f - 1.0f;
 
-    // float2 offsetTransformed = offset;
-    float2 offsetTransformed;
-    offsetTransformed.x = noise.r*offset.x - noise.g*offset.y;
-    offsetTransformed.y = noise.g*offset.x + noise.r*offset.y;
+    float2 offsetTransformed = offset;
+    //float2 offsetTransformed;
+    //offsetTransformed.x = noise.r*offset.x - noise.g*offset.y;
+    //offsetTransformed.y = noise.g*offset.x + noise.r*offset.y;
                 
-    float2 texcoord = IN.texCoord.xy + offsetTransformed * areaSize;// * (1.0f - centerPositionW.w);
+    // weight with projected coordinate to reach similar kernel size for near and far
+    float2 texcoord = IN.texCoord.xy + offsetTransformed * areaSize * centerPositionW.w;
     
     float3 sample_position = tex2D(positions, texcoord).xyz;
     
     float3 vector_to_sample = sample_position - centerPosition;
-    // vector_to_sample.z = -vector_to_sample.z;
     float length_to_sample = length(vector_to_sample);
     float3 direction_to_sample = vector_to_sample / (length_to_sample + 1e-9f);
@@ -95 +96 @@
     
     // distance between current position and sample position controls AO intensity.
-    const float maxdist = 5e-1f;
+    const float maxdist = 1e-1f;
     //const float scale = 50.0f;
 
@@ -116 +117 @@
 {
   pixel OUT;
-  //float4 lightDir = float4(1.0f, 1.0f, 1.0f, 0.0f);
-float4 lightDir = float4(0.0f, 1.0f, 0.0f, 0.0f);
+  float4 lightDir = float4(1.0f, 1.0f, 1.0f, 0.0f);
+  //float4 lightDir = float4(0.0f, 1.0f, 0.0f, 0.0f);
   
   float4 color = tex2D(colors, IN.texCoord.xy);
@@ -126 +127 @@
   float4 position = tex2D(positions, IN.texCoord.xy);
 
-  float4 ambient = float4(0.1f);
+  float4 ambient = float4(0.3f);
 
   // float3 L = normalize(lightPosition - position);
@@ -135 +136 @@
 
   float ao = ssao(IN, positions, normals, ProjTrafo, noiseTexture);
-  OUT.color = ao; //(ambient + diffuse) * color;
-  //OUT.color = (ambient + diffuse) * color;
+  OUT.color = ao; 
+  //OUT.color = ao * (ambient + diffuse) * color;
+
+  //float4 currentPos = tex2D(normals, IN.texCoord.xy) * 0.5f + 0.5f;
+  //float4 currentPos = tex2D(positions, IN.texCoord.xy);
+  //OUT.color = currentPos.w;
   
-  //float4 currentPos = tex2D(positions, IN.texCoord.xy);
-  //OUT.color = currentPos;
-  //float4 currentPos = tex2D(normals, IN.texCoord.xy) * 0.5f + 0.5f;
-  //OUT.color = currentPos;
-  
+    
   return OUT;
 }

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

@@ -26 +26 @@
   float4 texCoord: TEXCOORD0;    
 
-  float4 dummy: WPOS;
+  float4 projPos: WPOS;
   float4 color: COLOR0;  
   float4 worldPos: TEXCOORD1; // world position
@@ -66 +66 @@
   pix.col = tex2D(tex, IN.texCoord.xy);
   pix.pos = IN.worldPos * maxDepth;
+  pix.pos.w = IN.projPos.w;
   pix.norm = IN.normal;