Changeset 2872

Timestamp:

08/27/08 07:50:52 (16 years ago)

Author:

mattausch

Message:

working to incorporate indirect illumination

File:

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

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

@@ -10 +10 @@
 //#define SAMPLE_INTENSITY 0.125f
 
-#define AREA_SIZE 9e-1f
-//#define VIEW_CORRECTION_SCALE 0.3f
-#define VIEW_CORRECTION_SCALE 0.5f
+#define AREA_SIZE 7e-1f
+//#define AREA_SIZE 3e-1f
+#define VIEW_CORRECTION_SCALE 0.3f
+//#define VIEW_CORRECTION_SCALE 0.5f
 #define DISTANCE_SCALE 1e-6f
 
@@ -114 +115 @@
         }
 
-        return (1.0f - total_ao);
+        return max(0.0f, 1.0f - total_ao);
         //return dot(currentViewDir, currentNormal);
 }
@@ -121 +122 @@
 /** Computes ambient occlusion + diffuse reflections
 */
-/*
 float4 globIllum(fragment IN,
                                  uniform sampler2D colors,
@@ -140 +140 @@
         // Summing up these angles gives an estimation of the occlusion at the current position.
 
-        float total_ao = 0.0;
-        float3 total_color = float3(0.0f);
+        // ao is in stored in the w
+        float4 total_color = float4(0, 0, 0, 1);
 
         const float areaSize = 5e-1f;
@@ -153 +153 @@
 
                 // rotation
-                float2 offsetTransformed = rotate(offset, mynoise);
+                float2 offsetTransformed = reflect(offset, mynoise);
 
                 // weight with projected coordinate to reach similar kernel size for near and far
@@ -159 +159 @@
 
                 float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, 1)).xyz;
-                float3 sample_color = tex2D(colors, float4(texcoord, 0, 1)).xyz;
+                float3 sample_color = tex2Dlod(colors, float4(texcoord, 0, 1)).xyz;
 
                 float3 vector_to_sample = sample_position - centerPosition.xyz;
@@ -176 +176 @@
                 float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
 
-                total_ao += cos_angle * distance_intensity * view_correction;
-                float scale_factor = 0.3f;
-                total_color += cos_angle * distance_intensity * view_correction * sample_color * scale_factor;
-        }
-
-        return float4(total_color, 1.0f - total_ao);
-}
-*/
+                total_color.w -= cos_angle * distance_intensity * view_correction;
+
+                const float scale_factor = 0.3f;
+                total_color.xyz += cos_angle * distance_intensity * view_correction * sample_color * scale_factor;
+        }
+
+        return saturate(total_color);
+}
+
 
 /** The mrt shader for screen space ambient occlusion
@@ -208 +209 @@
 
         // expand normal
-        float3 normal = normalize(norm.xyz);// * 2.0f - 1.0f);
+        float3 normal = normalize(norm.xyz);
         /// the current view direction
         float3 viewDir = normalize(IN.view * 2.0f - float3(1.0f));
@@ -219 +220 @@
         const float currentDepth = currentCol.w;
 
-        float4 new_col = (float4)ssao(IN, positions, noiseTexture, samples, normal, viewDir, noiseMultiplier, centerPosition);
-        //float4 new_col = globIllum(IN, colors, positions, noiseTexture, samples, normal, viewDir, noiseMultiplier, centerPosition); 
+        //float4 new_col = (float4)ssao(IN, positions, noiseTexture, samples, normal, viewDir, noiseMultiplier, centerPosition);
+        float4 new_col = globIllum(IN, colors, positions, noiseTexture, samples, normal, viewDir, noiseMultiplier, centerPosition); 
         
 
@@ -250 +251 @@
         }
 
-
-        OUT.combined_col = currentCol * OUT.illum_col;
+        //const float ao = OUT.illum_col.x;
+        const float ao = OUT.illum_col.w;
+
+        //OUT.combined_col = (currentCol + OUT.illum_col) * ao;
+        OUT.combined_col = currentCol * ao;
 
         OUT.illum_col.w = currentDepth;