Changeset 2864 for GTP/trunk

Timestamp:

08/25/08 08:34:10 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• default.env (modified) (1 diff)
• src/CHCPlusPlusTraverser.cpp (modified) (3 diffs)
• src/Camera.cpp (modified) (1 diff)
• src/Visualization.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (3 diffs)
• src/shaders/antialiasing.cg (added)
• src/shaders/linearDepth.cg (deleted)

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

@@ -784 +784 @@
                         >
                         <File
+                                RelativePath=".\src\shaders\antialiasing.cg"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\src\shaders\deferred.cg"
                                 >

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

@@ -10 +10 @@
 winHeight=768
 camPosition=483.398f 242.364f 186.078f
-camDirection=1 0 0
+camDirection=-1 -1 0
 useFullScreen=0
 #modelPath=data/city/model/

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

@@ -82 +82 @@
 void CHCPlusPlusTraverser::Traverse()
 {
+        int waitedForQueries = 0;
+        int returnedQueries = 0;
+
         //-- PART 1: process finished occlusion queries
         while (!mDistanceQueue.empty() || !mQueryQueue.empty())
@@ -101 +104 @@
                         }
                         
+                        if (!resultAvailable)
+                                ++ waitedForQueries;
+                        ++ returnedQueries;
+
                         OcclusionQuery *query = mQueryQueue.front();
                         mQueryQueue.pop();
@@ -211 +218 @@
                 HandleQueryResult(query);
         }
+
+        //cout << "returned queries: " << returnedQueries << " waited for queries: " << waitedForQueries << " (=" << 100.0f * waitedForQueries / returnedQueries << "%)" << endl;
 }
 

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

@@ -221 +221 @@
 
 
-void Camera::SetDirection(const Vector3 &direction)
-{
-        Vector3 h1 = direction; h1.z = 0; 
-        
-        if (SqrMagnitude(h1) > 0)
-        {
-                h1.Normalize();
-                mPitch = acos(DotProd(h1, Vector3(0, 1, 0)));
-        }
-
-        Vector3 h2 = direction; 
-        
-        if (SqrMagnitude(h2) > 0)
-        {
-                h2.Normalize();
-                mYaw = -acos(DotProd(h2, h1));
-        }
+void Camera::SetDirection(const Vector3 &dir)
+{
+        Normalize(dir);
+
+        mPitch = atan2(dir.x, dir.z);
+        mYaw = atan2(dir.y, sqrt((dir.x * dir.x) + (dir.z * dir.z)));
 
         CalculateFromPitchAndYaw();

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

@@ -168 +168 @@
         glBegin(GL_LINE_LOOP);
         glVertex3d(fbl.x, fbl.y, fbl.z);
-        glVertex3d(fbr.x, fbr.y, fbr.z);
-        glVertex3d(ftr.x, ftr.y, ftr.z);
-        glVertex3d(ftl.x, ftl.y, ftl.z);
-        glEnd();
-
-        glBegin(GL_LINE_LOOP);
-        glVertex3d(nbl.x, nbl.y, nbl.z);
-        glVertex3d(nbr.x, nbr.y, nbr.z);
-        glVertex3d(ntr.x, ntr.y, ntr.z);
-        glVertex3d(ntl.x, ntl.y, ntl.z);
-        glEnd();
-
-        glBegin(GL_LINE_LOOP);
-        glVertex3d(fbl.x, fbl.y, fbl.z);
         glVertex3d(ftl.x, ftl.y, ftl.z);
         glVertex3d(ntl.x, ntl.y, ntl.z);

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

@@ -746 +746 @@
 void SetupEyeView()
 {
-        Matrix4x4 matViewing, matProjection;
-
         // store matrix of last frame
         oldViewProjMatrix = matProjectionView;
@@ -758 +756 @@
         glMatrixMode(GL_MODELVIEW);
         glLoadIdentity();
+
+        // set up the camera view
         camera->SetupCameraView();
 
+        // set lights
         GLfloat position[] = {0.8f, -1.0f, 0.7f, 0.0f};
         glLightfv(GL_LIGHT0, GL_POSITION, position);
@@ -767 +768 @@
 
         
+        /////////////////
+
+        Matrix4x4 matViewing, matProjection;
+
         camera->GetModelViewMatrix(matViewing);
         camera->GetProjectionMatrix(matProjection);
 
+        // store matrix for later use
         matProjectionView = matViewing * matProjection;