Changeset 3079 for GTP

Timestamp:

10/29/08 18:21:41 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (8 diffs)
• shaderenv.h (modified) (2 diffs)
• shaders/ssao.cg (modified) (4 diffs)

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

@@ -732 +732 @@
         glDrawBuffers(1, mrt + colorBufferIdx);
 
-        float filterOffsets[NUM_DOWNSAMPLES * 2];
-        float filterWeights[NUM_DOWNSAMPLES];
-
-        PoissonDiscSampleGenerator2 poisson(NUM_DOWNSAMPLES, 1.0f);
+        float filterOffsets[NUM_SSAO_FILTERSAMPLES * 2];
+        float filterWeights[NUM_SSAO_FILTERSAMPLES];
+
+        PoissonDiscSampleGenerator2 poisson(NUM_SSAO_FILTERSAMPLES, 1.0f);
         poisson.Generate((float *)filterOffsets);
 
-        const float xoffs = 2.0f / fbo->GetWidth();
-        const float yoffs = 2.0f / fbo->GetHeight();
-
-        for (int i = 0; i < NUM_DOWNSAMPLES; ++ i)
+        const float filterWidth = 10.0f;
+        const float xoffs = filterWidth / fbo->GetWidth();
+        const float yoffs = filterWidth / fbo->GetHeight();
+
+        for (int i = 0; i < NUM_SSAO_FILTERSAMPLES; ++ i)
         {
                 float x = filterOffsets[2 * i + 0];
@@ -756 +757 @@
         sCgCombineSsaoProgram->SetTexture(1, ssaoTex);
 
-        sCgCombineSsaoProgram->SetArray2f(2, (float *)filterOffsets, NUM_DOWNSAMPLES);
-        sCgCombineSsaoProgram->SetArray1f(3, (float *)filterWeights, NUM_DOWNSAMPLES);
+        sCgCombineSsaoProgram->SetArray2f(2, (float *)filterOffsets, NUM_SSAO_FILTERSAMPLES);
+        sCgCombineSsaoProgram->SetArray1f(3, (float *)filterWeights, NUM_SSAO_FILTERSAMPLES);
         
         DrawQuad(sCgCombineSsaoProgram);

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

@@ -458 +458 @@
         //-- load some dynamic stuff
 
-        LoadModel("hbuddha.dem", dynamicObjects);
+        /*LoadModel("hbuddha.dem", dynamicObjects);
         buddha = dynamicObjects.back();
         
@@ -480 +480 @@
                 ent->SetTransform(transform);
                 dynamicObjects.push_back(ent);
-        }
+        }*/
 
 
@@ -880 +880 @@
 
         Matrix4x4 mat = TranslationMatrix(planepos);
-        buddha->GetTransform()->SetMatrix(mat);
+        //buddha->GetTransform()->SetMatrix(mat);
 
         Vector3 oldPos = camera->GetPosition();
@@ -942 +942 @@
 
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
                 glEnableClientState(GL_NORMAL_ARRAY);
-
                 break;
 
@@ -963 +961 @@
                 // (should be handled by render state)
                 glShadeModel(GL_FLAT);
-
-
                 break;
 
@@ -978 +974 @@
                 // (should be handled by render state)
                 glShadeModel(GL_FLAT);
-                
-
                 break;
         
@@ -994 +988 @@
                 glEnableClientState(GL_NORMAL_ARRAY);
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
                 break;
         }
@@ -1019 +1012 @@
         }
         else
-        {glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        {
                 // actually render the scene geometry using the specified algorithm
                 traverser->RenderScene();
-                //for (int i = 0; i < sceneEntities.size(); ++ i)
-                //      sceneEntities[i]->Render(&state);
         }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -10 +10 @@
 
 // for quadratic falloff
-#define SAMPLE_INTENSITY 0.1f
-//#define SAMPLE_INTENSITY 0.2f
+//#define SAMPLE_INTENSITY 0.1f
+#define SAMPLE_INTENSITY 0.07f
 
 #define SAMPLE_RADIUS 8e-1f
@@ -44 +44 @@
 #define WHITE_LUMINANCE 3e4f
 
+
 ///////////////////
 
 #define NUM_DOWNSAMPLES 16
 
+#define NUM_SSAO_FILTERSAMPLES 100
 
 #endif // __SHADERENV_H

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

@@ -236 +236 @@
 float Filter(float2 texCoord, 
                          uniform sampler2D ssaoTex,
-                         uniform float2 filterOffs[NUM_DOWNSAMPLES],
-                         uniform float filterWeights[NUM_DOWNSAMPLES]
+                         uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
+                         uniform float filterWeights[NUM_SSAO_FILTERSAMPLES]
 )
 {
@@ -243 +243 @@
         float w = .0f;
 
-        for (int i = 0; i < NUM_DOWNSAMPLES; ++ i)
+        for (int i = 0; i < NUM_SSAO_FILTERSAMPLES; ++ i)
         {
                 average += filterWeights[i] * tex2Dlod(ssaoTex, float4(texCoord + filterOffs[i], 0, 0)).x;
@@ -258 +258 @@
                           uniform sampler2D colors,
                           uniform sampler2D ssaoTex,
-                          uniform float2 filterOffs[NUM_DOWNSAMPLES],
-                          uniform float filterWeights[NUM_DOWNSAMPLES]
+                          uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
+                          uniform float filterWeights[NUM_SSAO_FILTERSAMPLES]
                           )
 {
@@ -267 +267 @@
         float3 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        //if (ao.y < 2000.0f) 
-        //      ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
+        if (ao.y < 10.0f) 
+                ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
 
         OUT.illum_col = col * ao.x;