Changeset 2769 for GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp

Timestamp:

06/18/08 04:08:41 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp (modified) (10 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp

@@ -19 +19 @@
 #include "CHCPlusPlusTraverser.h"
 #include "Visualization.h"
-
+#include "RenderState.h"
 
 
@@ -80 +80 @@
 void SetupLighting();
 void DisplayStats();
+void Output(int x, int y, const char *string);
 
 void begin2D();
 void end2D();
-void output(int x, int y, const char *string);
 void keyboard(unsigned char c, int x, int y);
 void drawHelpMessage();
@@ -180 +180 @@
                 
         //glEnable(GL_ALPHA_TEST);
-        //glAlphaFunc(GL_GEQUAL, 0.01);
-
         glDisable(GL_ALPHA_TEST);
+        glAlphaFunc(GL_GEQUAL, 0.1f);
 
         glFrontFace(GL_CCW);
@@ -263 +262 @@
                 else 
                 {
-                        output(x, y, message[i]);
+                        Output(x, y, message[i]);
                         y += 14;
                 }
@@ -734 +733 @@
 
 
-void output(const int x, const int y, const char *string) 
+void Output(int x, int y, const char *string) 
 {
         if (string != 0) 
@@ -744 +743 @@
                 for (i = 0; i < len; ++ i) 
                 {
-                        glutBitmapCharacter(GLUT_BITMAP_8_BY_13, string[i]);
+                        glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, string[i]);
                 }
         }
@@ -841 +840 @@
         char msg3[200];
         char msg4[200];
+        char msg5[200];
 
 
@@ -856 +856 @@
         renderTime = traverser->GetStats().mRenderTime * expFactor + (1.0f - expFactor) * renderTime;
 
-        if (renderTime) fps /= (float)renderTime;
-
-        sprintf_s(msg3, "Threshold: %4d, render time: %ld ms (%3.3f fps), issued queries: %d%s", 
-                traverser->GetVisibilityThreshold(), renderTime, fps, traverser->GetStats().mNumIssuedQueries, optstr[useOptimization]);
+        if (renderTime) fps = 1e3f / (float)renderTime;
+
+        sprintf_s(msg2, "threshold: %4d%s", 
+                traverser->GetVisibilityThreshold(), optstr[useOptimization]);
 
         string str;
@@ -868 +868 @@
         CalcDecimalPoint(str2, traverser->GetStats().mNumRenderedTriangles);
 
-        sprintf_s(msg4, "rendered objects %5d (of %5d), rendered triangles: %s (of %s)", 
+        sprintf_s(msg3, "rendered objects: %6d (of %6d), rendered triangles: %s (of %s)", 
                           traverser->GetStats().mNumRenderedGeometry, sceneEntities.size(), str.c_str(), str2.c_str()); 
+
+        sprintf_s(msg4, "issued queries: %5d", traverser->GetStats().mNumIssuedQueries);
+
+        sprintf_s(msg5, "fps: %6.1f", fps);
 
 
@@ -880 +884 @@
         else
         {
-                glColor3f(1.0f, 1.0f , 1.0f);
-                output(10, winHeight - 10, msg[renderMode]);
+                glColor3f(1.0f, 1.0f, 1.0f);
+                
+                Output(800, 30, msg[renderMode]);
 
                 if(showStatistics)
                 {
-                        output(20, winHeight - 70, msg3);
-                        output(20, winHeight - 50, msg4);
-                        output(20, winHeight - 30, msg2);
+                        Output(20, 30, msg2);
+                        Output(20, 60, msg3);
+                        Output(20, 90, msg4);
+                        Output(20, 120, msg5);
                 }
         }