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

Timestamp:

07/11/08 01:12:05 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

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

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

@@ -6 +6 @@
 //#define SAMPLE_INTENSITY 0.5f
 //#define SAMPLE_INTENSITY 1.1f
-#define SAMPLE_INTENSITY 0.7f
+#define SAMPLE_INTENSITY 0.25f
 #define AREA_SIZE 5e-1f
 
@@ -14 +14 @@
   float4 pos: WPOS; // normalized screen position
   float4 texCoord: TEXCOORD0; 
+  float3 view: COLOR0;
 };
 
@@ -51 +52 @@
            uniform float2 samples[NUM_SAMPLES],
            uniform float3 currentNormal,
-           uniform float noiseMultiplier)
+           uniform float3 currentViewDir)
 {
   // the current world position
@@ -72 +73 @@
     
     //sample noisetex; r stores costheta, g stores sintheta
-    float2 noise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
+    float2 noise = tex2D(noiseTexture, IN.texCoord.xy * 7.1f).xy * 2.0f - 1.0f;
         
     // rotation
@@ -98 +99 @@
     //const float maxdist = 5e-1f;
     const float distanceScale = 1e-6f;
-    //float distance_intensity = maxdist - length_to_sample;
-    float distance_intensity = (SAMPLE_INTENSITY * distanceScale) / (distanceScale + length_to_sample * length_to_sample);
-    //distance_intensity = max(distance_intensity, 0.0f);
-    // quadratic influence
-    //distance_intensity *= distance_intensity;
-    
-    total_ao += cos_angle * distance_intensity;
+
+    float distance_intensity = 
+      (SAMPLE_INTENSITY * distanceScale) / (distanceScale + length_to_sample * length_to_sample);
+
+    // if normal perpenticular to view dir, only half of the samples count
+    float view_correction = (2.0f - dot(currentViewDir, currentNormal));
+
+    total_ao += cos_angle * distance_intensity * view_correction;
   }
         
@@ -133 +135 @@
   float diffuseLight2 = max(dot(normal, light2), 0.0f);
 
-  float diffuse = diffuseLight + diffuseLight2;
+  //float diffuse = diffuseLight + diffuseLight2;
+  float diffuse = diffuseLight;
 
   return (ambient + diffuse) * color * (1.0f - amb) + amb * color;
@@ -140 +143 @@
 
 pixel main_ssao(fragment IN, 
-               uniform sampler2D colors,
-               uniform sampler2D positions,
-               uniform sampler2D normals,
-               uniform sampler2D noiseTexture,
-               uniform float2 samples[NUM_SAMPLES],
-               uniform float noiseMultiplier)
+                uniform sampler2D colors,
+                uniform sampler2D positions,
+                uniform sampler2D normals,
+                uniform sampler2D noiseTexture,
+                uniform float2 samples[NUM_SAMPLES])
 {
   pixel OUT;
@@ -154 +156 @@
   // expand normal
   normal = normalize(normal * 2.0f - 1.0f);
+  float3 viewDir = normalize(IN.view * 2.0f - float(1.0f));
 
   float4 col = shade(IN, colors, positions, normal, amb);
-  float ao = ssao(IN, positions, noiseTexture, samples, normal, noiseMultiplier);
+  float ao = ssao(IN, positions, noiseTexture, samples, normal, viewDir);
   
    //OUT.color = ao;
@@ -175 +178 @@
   float amb = normal.w;
 
+  //OUT.color.xyz = IN.view;
   // expand normal
-  normal = normalize(normal * 2.0f - 1.0f);
+  normal = normalize(normal * 2.0f - float4(1.0f));
   
   float4 col = shade(IN, colors, positions, normal.xyz, amb);

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

@@ -91 +91 @@
   pix.col = diffuse;
   pix.pos = IN.worldPos * maxDepth;
-  pix.norm.xyz = IN.normal * 0.5f + 0.5f;
+  pix.norm.xyz = IN.normal * 0.5f + float4(0.5f);
   // hack: squeeze some information about ambient into the texture
   pix.norm.w = ambient.x;