Changeset 2803 for GTP/trunk

Timestamp:

06/28/08 16:20:34 (17 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• RenderQueue.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (7 diffs)

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

@@ -9 +9 @@
 using namespace std;
 
-// sort by alpha, in second instance per texture
-//#define SORT_ALPHA
 
 namespace CHCDemoEngine
@@ -174 +172 @@
                         int tsize = mat->GetTexture() ? mat->GetTexture()->GetByteSize() : 0;
                         float dist = SqrMagnitude(ent->GetBoundingBox().Center() - mCamera->GetPosition());
-                        Debug << "e: " << ent << " a: " << mat->IsAlphaTestEnabled() << " s: " << tsize << " d: " << dist << " " << ent->GetBoundingBox() << " g: " << ent->GetGeometry() << " t: " << ent->GetTransformation() << " m: " << ent->GetMaterial() << endl;
+                        Debug << "e: " << ent << " a: " << mat->IsAlphaTestEnabled() << " s: " << tsize << " d: " << dist << " " << endl;
                 }
         }

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

@@ -105 +105 @@
 bool flyMode = true;
 bool depthPass = false;
-
+bool useGlFinish = false;
 
 SceneEntityContainer skyGeometry;
@@ -308 +308 @@
                 "'F6',          - shows/hides parameters",
                 "'F7',          - depth pass",
+                "'F8',          - enable/disable glFinish for more accurate timings",
                 "'SPACE'        - cycles through occlusion culling algorithms",
                 "",
@@ -516 +517 @@
         if (!flyMode) PlaceViewer(oldPos);
 
-        // note: have to flush queue in order to get reliable timings
-        // for optimal performance, remove this
-        //glFinish();
+        if (useGlFinish) glFinish();
 
         algTimer.Start();
@@ -571 +570 @@
         glDisableClientState(GL_NORMAL_ARRAY);
 
-
-        
-        // note: have to flush queue in order to get reliable timings
-        // for optimal performance, remove this
-        //glFinish();
+        if (useGlFinish) glFinish();
+
         algTime = algTimer.Elapsedms();
 
@@ -774 +770 @@
                 traverser->SetUseDepthPass(depthPass);
                 break;
+        case GLUT_KEY_F8:
+                useGlFinish = !useGlFinish;
+                break;
         case GLUT_KEY_LEFT:
                 {
@@ -1094 +1093 @@
 
         // if some strange render time spike happened in this frame => don't count
-        //if (algTime < 1000) renderTime = algTime * expFactor + (1.0f - expFactor) * algTime;
-
-        renderTime = 1e3f * (elapsedTime * expFactor + (1.0f - expFactor) * elapsedTime);
+        if (algTime < 1000) renderTime = algTime * expFactor + (1.0f - expFactor) * algTime;
+        //renderTime = 1e3f * (elapsedTime * expFactor + (1.0f - expFactor) * elapsedTime);
 
         accumulatedTime += elapsedTime * 1e3f;
@@ -1120 +1118 @@
                       assumedVisibleFrames, maxBatchSize);
 
-        sprintf(msg3, "render queue: %d, depth pass: %d, multiqueries: %d, tight bounds: %d", 
-                      useRenderQueue, depthPass, useMultiQueries, useTightBounds);
+        sprintf(msg3, "multiqueries: %d, tight bounds: %d, render queue: %d, depth pass: %d, glFinish: %d", 
+                      useMultiQueries, useTightBounds, useRenderQueue, depthPass, useGlFinish);
 
         string str;