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

Timestamp:

07/07/08 18:41:45 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• deferred.cg (modified) (5 diffs)
• mrt.cg (modified) (1 diff)

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

@@ -1 +1 @@
 #define NUM_SAMPLES 8
-#define SAMPLE_INTENSITY 0.6
+#define SAMPLE_INTENSITY 0.5f
+//#define SAMPLE_INTENSITY 0.2f
 #define AREA_SIZE 3e-1f
+
 // kustls magic sample positions
 /*static const float2 samples[NUM_SAMPLES] =
@@ -57 +59 @@
 
 
+float2 rotate(float2 pt, float2 n)
+{
+  float2 ptTransformed;
+  ptTransformed.x = n.r * pt.x - n.g * pt.y;
+  ptTransformed.y = n.g * pt.x + n.r * pt.y;
+
+  return ptTransformed;
+}
+
+
 //based on kustls shader        
 float ssao(fragment IN,
@@ -88 +100 @@
     
     //sample noisetex; r stores costheta, g stores sintheta
-    float3 noise = tex2D(noiseTexture, IN.texCoord.xy).xyz * 2.0f - 1.0f;
+    float2 noise = tex2D(noiseTexture, IN.texCoord.xy).xy * 2.0f - 1.0f;
         
     // rotation
     //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 = rotate(offset, noise);
+    //float2 offsetTransformed = reflect(offset, noise);
+
+    //offsetTransformed.x = noise.r * offset.x - noise.g * offset.y;
+    //offsetTransformed.y = noise.g * offset.x + noise.r * offset.y;
                 
     // weight with projected coordinate to reach similar kernel size for near and far
@@ -114 +128 @@
 
     float distance_intensity = maxdist - length_to_sample;
+    distance_intensity = max(distance_intensity, 0.0f);
+    // quadratic influence
     distance_intensity *= distance_intensity;
-    distance_intensity = max(distance_intensity, 0.0f);
     
     total_ao += cos_angle * SAMPLE_INTENSITY * distance_intensity;
@@ -155 +170 @@
 
 
+pixel main_ssao(fragment IN, 
+               uniform sampler2D colors,
+               uniform sampler2D positions,
+               uniform sampler2D normals,
+               uniform sampler2D noiseTexture,
+               uniform float2 samples[NUM_SAMPLES])
+{
+  pixel OUT;
+
+  float4 col = shade(IN, colors, positions, normals);
+  float ao = ssao(IN, positions, normals, noiseTexture, samples);
+  
+  //OUT.color = tex2D(positions, IN.texCoord.xy);
+  //OUT.color = ao;
+  //OUT.color =  col;
+  OUT.color = ao * col;
+
+  return OUT;
+}
+
+
 pixel main(fragment IN, 
            uniform sampler2D colors,
            uniform sampler2D positions,
-           uniform sampler2D normals,
-           uniform sampler2D noiseTexture,
-           uniform float2 samples[NUM_SAMPLES])
+           uniform sampler2D normals)
 {
   pixel OUT;
 
-  float4 col = Shade(IN, positions, normals);
-  float ao = ssao(IN, positions, normals, noiseTexture, samples);
-  //float ao = 1.0f;
-  OUT.color = ao * col; 
-  //OUT.color = ao * (ambient + diffuse) * color;
-  //OUT.color = (ambient + diffuse) * color;
-      
+  float4 col = shade(IN, colors, positions, normals);
+  OUT.color = col;
+
   return OUT;
 }

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

@@ -56 +56 @@
    OUT.position = mul(ModelViewProj, OUT.worldPos);
 
-   OUT.worldPos = IN.position;
-
    OUT.normal = IN.normal;
 
    return OUT;
 }
-
-/*struct Material
-{
-  float4 diffuse;
-}*/