Changeset 2853 for GTP/trunk

Timestamp:

08/19/08 16:36:13 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• src/LODInfo.h (modified) (1 diff)
• src/Plane3.h (modified) (3 diffs)
• src/ResourceManager.cpp (modified) (2 diffs)
• src/SampleGenerator.cpp (added)
• src/SampleGenerator.h (added)
• src/SceneEntity.cpp (modified) (2 diffs)
• src/chcdemo.cpp (modified) (6 diffs)
• src/shaders/deferred.cg (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.vcproj

@@ -284 +284 @@
                         </File>
                         <File
+                                RelativePath=".\src\SampleGenerator.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\src\SampleGenerator.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\src\SceneQuery.cpp"
                                 >

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

@@ -10 +10 @@
 
 /** Class representing information about an LOD level.
+        The distance parameter indicates the distance where this
+        lod level is invoked - if the parameter value is smaller or equal 
+        than the distance to the view point.
 */
 struct LODLevel

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

@@ -16 +16 @@
         Plane3() {}
 
-        //Plane3(const Vector3 &normal, float dist);
-
         Plane3(const Vector3 &a, const Vector3 &b, const Vector3 &c);
 
@@ -27 +25 @@
                 mD *= -1;
         }
-        /** Get disance to point.
+        /** Get distance to a point.
         */
         inline float Distance(const Vector3 &v) const 
@@ -73 +71 @@
         Vector3 mNormal;
         float mD;
-
-        //////////////////
-
 };
 

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

@@ -60 +60 @@
         //-- load lod levels
 
+        // note: lods must be ordered from smallest distance to largest
         int numLODs;
         str.read(reinterpret_cast<char *>(&numLODs), sizeof(int));
@@ -65 +66 @@
         for (int i = 0; i < numLODs; ++ i)
         {
-                float distance;
-                str.read(reinterpret_cast<char *>(&distance), sizeof(float));
+                float dist;
+                str.read(reinterpret_cast<char *>(&dist), sizeof(float));
 
                 int numShapes;
                 str.read(reinterpret_cast<char *>(&numShapes), sizeof(int));
 
-                LODLevel *lodLevel = new LODLevel(distance);
+                LODLevel *lodLevel = new LODLevel(dist);
 
                 for (int j = 0; j < numShapes; ++ j)

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

@@ -35 +35 @@
         const Vector3 pos = GetCenter();
 
-        const float distance = SqrDistance(pos, viewPoint);
+        const float dist = SqrDistance(pos, viewPoint);
 
         mCurrentLODLevel = 0;
 
+        // note: we assume that lods are ordered from smallest distance to largest
         const int l = (int)mLODLevels.size();
 
@@ -45 +46 @@
                 LODLevel *lod = mLODLevels[i];
 
-                if (lod->GetSquaredDistance() > distance)
+                if (lod->GetSquaredDistance() > dist)
                         break;
 

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

@@ -31 +31 @@
 #include "Halton.h"
 #include "Transform3.h"
+#include "SampleGenerator.h"
 
 
@@ -188 +189 @@
 bool useFullScreen = false;
 
-float expFactor = 0.1f;
+// exp factor for ssao
+float expFactor = 0.05f;
 
 // ssao number of samples
@@ -376 +378 @@
         glutInitWindowSize(winWidth, winHeight);
         glutInit(&argc, argv);
-        //glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_MULTISAMPLE);
-        glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH);
+        glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_MULTISAMPLE);
+        //glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH);
 
         //glutInitDisplayString("samples=2");
@@ -2041 +2043 @@
         bool validIntersect = sceneQuery->CalcIntersection(playerPos);
 
-        if (validIntersect ) 
+        if (validIntersect) 
                 // && ((playerPos.z - oldPos.z) < bvh->GetBox().Size(2) * 1e-1f))
         {
@@ -2271 +2273 @@
 void GenerateSamples()
 {
-        static HaltonSequence halton;
+        /*static HaltonSequence halton;
 
         float r[2];
@@ -2328 +2330 @@
                         }
                 }
-                //cout << "sample: " << samples[i] << " " << i / 2 << " " << samples[i + 1] << " r: " << sqrt(samples[i] * samples[i]  + samples[i + 1] * samples[i + 1]) << " tries: " << totalTries << endl;
-        }
-
-        //cout << "minDist after= " << minDist << endl;
+        }
+*/
+
+        static PoissonDiscSampleGenerator poisson(NUM_SAMPLES, 1.0f);
+        poisson.Generate((Sample2 *)samples);
 }
 

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

@@ -10 +10 @@
 //#define SAMPLE_INTENSITY 0.125f
 
-#define AREA_SIZE 5e-1f
+#define AREA_SIZE 9e-1f
 #define VIEW_CORRECTION_SCALE 0.3f
 #define DISTANCE_SCALE 1e-6f
@@ -254 +254 @@
                 (tex.y >= 0.0f) && (tex.y < 1.0f) && 
                 (abs(depthDif)  < 8e-5f))
+        {
                 OUT.color = attenuated_color * expFactor + col1 * float4(1.0f - expFactor);
+        }
         else
+        {
                 OUT.color = attenuated_color;
+        }
 
         OUT.color.w = tex2D(colors, IN.texCoord.xy).w;