Changeset 2903 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/globillum.cg

Timestamp:

09/04/08 15:00:42 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -46 +46 @@
                                  uniform float3 currentNormal,
                                  uniform float3 currentViewDir,
-                                 uniform float noiseMultiplier,
                                  uniform float4 centerPosition
                                  )
@@ -67 +66 @@
         {
                 float2 offset = samples[i];
-                //float3 offset = float3(samples[i], 0);
-
-                //sample noisetex; r stores costheta, g stores sintheta
-                float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
-                //float3 mynoise = float3(tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy, 0);
-
-                // reflect sampling using the noise texture
+
+#if 1
+                ////////////////////
+                // add random noise: reflect around random normal vector (warning: slow!)
+                float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy).xy;
                 float2 offsetTransformed = myreflect(offset, mynoise);
-
+#else
+                float2 offsetTransformed = offset;
+#endif
                 // weight with projected coordinate to reach similar kernel size for near and far
                 float2 texcoord = IN.texCoord.xy + offsetTransformed * AREA_SIZE * w;
@@ -96 +95 @@
 
                 // if normal perpenticular to view dir, only half of the samples count
-                //const float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
-                //total_color.w -= cos_angle * distance_intensity * view_correction;
-                //total_color.xyz += cos_angle * distance_intensity * view_correction * sample_color * ILLUM_INTENSITY;
-
+                /*
+                const float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
+                total_color.w -= cos_angle * distance_intensity * view_correction;
+                total_color.xyz += cos_angle * distance_intensity * view_correction * sample_color * ILLUM_INTENSITY;
+                */
                 total_color.w -= cos_angle * distance_intensity;
                 total_color.xyz += cos_angle * distance_intensity * sample_color * ILLUM_INTENSITY;
@@ -116 +116 @@
                    uniform sampler2D noiseTexture,
                    uniform float2 samples[NUM_SAMPLES],
-                   uniform float noiseMultiplier,
                    uniform sampler2D oldSsaoTex,
                    uniform sampler2D oldIllumTex,
@@ -146 +145 @@
 
         float4 new_color = globIllum(IN, colors, positions, noiseTexture, 
-                                 samples, normal, viewDir, noiseMultiplier, centerPosition);
+                                 samples, normal, viewDir, centerPosition);