Changeset 2836 for GTP

Timestamp:

07/14/08 18:17:50 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• chcdemo.cpp (modified) (1 diff)
• default.env (modified) (2 diffs)
• shaders/deferred.cg (modified) (5 diffs)
• shaders/mrt.cg (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -2095 +2095 @@
                 cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(3.0f, 17.0f));
 
-                //GenerateSamples(); cgGLSetParameterArray2f(sSamplesParamSsao, 0, NUM_SAMPLES, (const float *)samples);
+                GenerateSamples(); cgGLSetParameterArray2f(sSamplesParamSsao, 0, NUM_SAMPLES, (const float *)samples);
         }
         else

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/default.env

@@ -5 +5 @@
 maxBatchSize=50
 trianglesPerVirtualLeaf=500
-keyForwardMotion=30.0f
+keyForwardMotion=20.0f
 keyRotation=1.5f
 winWidth=1024
@@ -12 +12 @@
 useFullScreen=0
 numSsaoSamples=8
-

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

@@ -7 +7 @@
 //#define SAMPLE_INTENSITY 0.125f
 // rule of thumb: approx 1 / NUM_SAMPLES
-#define SAMPLE_INTENSITY 0.16 //0.0625f
+#define SAMPLE_INTENSITY 0.22 //0.0625f
 
 #define AREA_SIZE 5e-1f
@@ -14 +14 @@
 struct fragment
 {
-  float4 pos: WPOS; // normalized screen position
-  float4 texCoord: TEXCOORD0; 
-  float3 view: COLOR0;
+         // normalized screen position
+        float4 pos: WPOS;
+        float4 texCoord: TEXCOORD0; 
+        float3 view: COLOR0;
 };
 
@@ -68 +69 @@
 
         const float areaSize = 5e-1f;
-        //const float areaSize = 3e-1f;
-        //const float sampleIntensity = 0.2f;
 
         for (int i = 0; i < NUM_SAMPLES; i ++) 
@@ -164 +163 @@
                         (SAMPLE_INTENSITY * distanceScale) / (distanceScale + length_to_sample * length_to_sample);
 
+                const float view_correction_scale = 0.5f;
                 // if normal perpenticular to view dir, only half of the samples count
-                float view_correction = 1.0f + 0.5f * (1.0f - dot(currentViewDir, currentNormal));
+                float view_correction = 1.0f + view_correction_scale * (1.0f - dot(currentViewDir, currentNormal));
 
                 total_ao += cos_angle * distance_intensity * view_correction;
-                total_color += cos_angle * distance_intensity * view_correction * sample_color;
+                total_color += cos_angle * distance_intensity * view_correction * sample_color * 0.3f;
         }
 
@@ -234 +234 @@
         float ao = new_col.w;
 
-        //float4 attenuated_color = ao * col + new_col;
-        float4 attenuated_color = ao * col;
+        float4 attenuated_color = ao * col + new_col;
+        //float4 attenuated_color = ao * col;
 
         //OUT.color = ao;
-        //OUT.color = ao * col; 
+        //OUT.color = ao * col;
+        //float4 col1 = attenuated_color;
+
+        const float x = 0.1f;
+
         float4 dummy = centerPosition * maxDepth;
         dummy.w = 1.0f;
+
         float4 oldPos = mul(oldModelViewProj, dummy);
 
         float newDepth = oldPos.z / oldPos.w;
  
-        const float x = 0.1f;
-
         float2 tex = (oldPos.xy / oldPos.w) * 0.5f + 0.5f;
         float4 col1 = tex2D(oldTex, tex);

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

@@ -78 +78 @@
   pix.pos = IN.worldPos * maxDepth;
   pix.norm.xyz = IN.normal * 0.5f + 0.5f;
+
   // hack: squeeze some information about ambient into the texture
   pix.norm.w = ambient.x;
   // hack: store projection coordinate for scaling ssao
   pix.pos.w = IN.projPos.w;
+
+  if (pix.col.w < 0.9f)
+          discard;
+
   pix.col.w = IN.mypos.z / IN.mypos.w;