Changeset 3371 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

05/19/09 12:02:26 (15 years ago)

Author:

mattausch

Message:

fehler tritt nicht auf!!

Location:

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

Files:

• DeferredRenderer.cpp (modified) (3 diffs)
• ResourceManager.cpp (modified) (2 diffs)
• SampleGenerator.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (2 diffs)
• shaderenv.h (modified) (2 diffs)
• shaders/ssao.cg (modified) (4 diffs)

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

@@ -845 +845 @@
 
         //if (mRegenerateSamples)
-        if (1)//mUseTemporalCoherence || mRegenerateSamples)
+        if (//mUseTemporalCoherence || 
+                mRegenerateSamples)
         {
                 mRegenerateSamples = false;
@@ -860 +861 @@
                 else
                 {
-                        //UpdateSampleTex(samples2, NUM_PRECOMPUTED_SAMPLES);
+                        UpdateSampleTex(samples2, NUM_PRECOMPUTED_SAMPLES);
                 }
 
@@ -867 +868 @@
                 //if (mSortSamples) { SortSamples(); }
                 sCgSsaoProgram->SetArray2f(i, (float *)samples2 + dummy, NUM_SAMPLES);
-
-                cout << "d " << dummy << " ";
 
                 dummy = (dummy + NUM_SAMPLES) % NUM_PRECOMPUTED_SAMPLES;

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

@@ -356 +356 @@
     str.read(reinterpret_cast<char *>(vertices), sizeof(Vector3) * vertexCount);
         
+        //cout << "vertexCount: " << vertexCount << endl;
+
         normals = new Vector3[vertexCount];
         str.read(reinterpret_cast<char *>(normals), sizeof(Vector3) * vertexCount);
 
+
         Vector3 *tangents;
 
@@ -374 +377 @@
         str.read(reinterpret_cast<char *>(&texCoordCount), sizeof(int));
 
+        //cout << "texCoordCount: " << texCoordCount << endl;
 
         if (texCoordCount)

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

@@ -181 +181 @@
         for (int i = 0; i < mNumSamples; ++ i)
         {
-                x[0] = RandomValue(0, 1); x[1] = RandomValue(0, 1);
-                //mHalton->GetNext(x);
+                //x[0] = RandomValue(0, 1); x[1] = RandomValue(0, 1);
+                mHalton->GetNext(x);
                 
                 const float a = 2.0f * M_PI * x[0];

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

@@ -669 +669 @@
 #if 1
 
-        //LoadModel("hbuddha.dem", dynamicObjects);
+        LoadModel("hbuddha.dem", dynamicObjects);
         //LoadModel("horse.dem", dynamicObjects);
-        LoadModel("happy2.dem", dynamicObjects);
+        //LoadModel("happy2.dem", dynamicObjects);
         //LoadModel("torus.dem", dynamicObjects);
         //LoadModel("venusm.dem", dynamicObjects);
@@ -835 +835 @@
         // another color buffer
         fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, ColorBufferObject::FILTER_NEAREST);
+
 
         for (int i = 0; i < 4; ++ i)

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

@@ -8 +8 @@
 //#define NUM_PRECOMPUTED_SAMPLES 8124
 #define NUM_PRECOMPUTED_SAMPLES 4096
-#define NUM_PRECOMPUTED_SAMPLES 64
+//#define NUM_PRECOMPUTED_SAMPLES 1024
 
 //#define NUM_SAMPLES 16
-//#define NUM_SAMPLES 24
+#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 32
-#define NUM_SAMPLES 64
+//#define NUM_SAMPLES 64
 
-#define MIN_SAMPLES 64
+#define MIN_SAMPLES 16
 //#define MIN_SAMPLES 48
 
@@ -66 +66 @@
 #define NUM_DOF_TABS 16
 
-#define USE_GTX
+//#define USE_GTX
 
 #define SSAO_FILTER_RADIUS 5

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

@@ -487 +487 @@
                 float2 offset;
 
-                //const float2 ssaoOffset = tex2Dlod(samples, float4((0.5f + i + oldIdx) / NUM_PRECOMPUTED_SAMPLES, .5f, .0f, .0f)).xy;
-                const float2 ssaoOffset = dummySamples[i];
+                const float2 ssaoOffset = tex2Dlod(samples, float4((0.5f + i + oldIdx) / NUM_PRECOMPUTED_SAMPLES, .5f, .0f, .0f)).xy;
+                //const float2 ssaoOffset = dummySamples[i];
 
                 ////////////////////
@@ -494 +494 @@
                 //-- (affects performance for some reason!)
 
-                if (0)//!USE_OPTIMIZATION ||
+                if (1)//!USE_OPTIMIZATION ||
                         //(convergence < SSAO_CONVERGENCE_THRESHOLD))
                 {
@@ -685 +685 @@
         float3 ao;
         //$$temp matt
-        oldIdx = dummyIdx;
+        //oldIdx = dummyIdx;
 
         // cull background note: this should be done with the stencil buffer
@@ -758 +758 @@
         //-- blend ao between old and new samples (and avoid division by zero)
 
-        OUT.illum_col.x = ao.x;// * newWeight + oldSsao * oldWeight;
-        //OUT.illum_col.x /= (newWeight + oldWeight);
+        OUT.illum_col.x = ao.x * newWeight + oldSsao * oldWeight;
+        OUT.illum_col.x /= (newWeight + oldWeight);
 
         OUT.illum_col.y = combinedWeight;