Changeset 3323 for GTP/trunk/App

Timestamp:

02/20/09 18:47:25 (16 years ago)

Author:

mattausch

Message:

now changing to precomputed sampling version

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter/ObjConverter.cpp (modified) (2 diffs)
• sibenik.env (modified) (1 diff)
• src/SampleGenerator.cpp (modified) (2 diffs)
• src/shaderenv.h (modified) (1 diff)
• src/shaders/combineSsaoSep.cg (modified) (3 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.cpp

@@ -107 +107 @@
 
 
-                        if (0)//!normals.empty())
+                        if (!normals.empty())
                         {
                                 faceNormals.push_back(normals[nIndices[idx1]]);
@@ -358 +358 @@
                 str.write(reinterpret_cast<char *>(geom->mTexcoords), sizeof(float) * texCoordCount * 2);
         
-/*
-        //////////////
-        //-- hack: a default material
+
         ///////
         //-- texture
-
+/*
 #ifdef USE_TEXTURE
         int texId = 0;

GTP/trunk/App/Demos/Vis/FriendlyCulling/sibenik.env

@@ -101 +101 @@
 ssaoUseFullResolution=1
 # ssao kernel radius
-#ssaoKernelRadius=2.5f
-ssaoKernelRadius=1.28f
+ssaoKernelRadius=2.5f
 # ssao sample intensity
 #ssaoSampleIntensity=0.2f
 ssaoSampleIntensity=0.8f
 # ssao temporal coherence factor
-tempCohFactor=2000.0f
+tempCohFactor=1500.0f
 # ssao filter radius
 ssaoFilterRadius=12.0f

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

@@ -169 +169 @@
                 s[i].y = r * sin(a);
 
-                total1 += x[0];
+                /*total1 += x[0];
                 total2 += x[1];
                 totalSamples ++;
@@ -179 +179 @@
 
                         cout << "here3 " << n1 << " " << n2 << endl;
-                }
+                }*/
         }
 }

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

@@ -9 +9 @@
 //#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
-#define NUM_SAMPLES 8
+#define NUM_SAMPLES 24
 
 //#define MIN_SAMPLES 48
-#define MIN_SAMPLES 8
+#define MIN_SAMPLES 24
 
 #define DISTANCE_SCALE 1e-2f

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

@@ -192 +192 @@
         {
                 // the filtered ssao value
-                //OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
         }
 
@@ -232 +232 @@
         {
                 // the filtered ssao value
-                //ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+                ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
         }
 
@@ -241 +241 @@
         if (depth < DEPTH_THRESHOLD)
         {
-                OUT.illum_col.xyz = col.xyz * max(minAO, 1.0f - ao.x);
-                //OUT.illum_col.xyz = max(minAO, 1.0f - ao.x);
+                //OUT.illum_col.xyz = col.xyz * max(minAO, 1.0f - ao.x);
+                OUT.illum_col.xyz = max(minAO, 1.0f - ao.x);
         }
         else