Changeset 2800 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

06/27/08 01:43:45 (16 years ago)

Author:

mattausch

Message:

friendly culling debug version with timers, no materials

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (19 diffs)

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

@@ -57 +57 @@
 int maxBatchSize = 50;
 
-int trianglesPerVirtualLeaf = 1000;
+int trianglesPerVirtualLeaf = INITIAL_TRIANGLES_PER_VIRTUAL_LEAVES;
 
 SceneQuery *sceneQuery = NULL;
@@ -83 +83 @@
 int queryCulledNodes = 0;
 int stateChanges = 0;
+int numBatches = 0;
 
 bool showHelp = false;
@@ -98 +99 @@
 bool useRenderQueue = true;
 bool useMultiQueries = true;
+
+bool flyMode = true;
 
 /// the accumulated z axis rotation
@@ -233 +236 @@
         visualization = new Visualization(bvh, camera, NULL, &state);
 
-        //sceneQuery = new SceneQuery(bvh->GetBox(), traverser);
+        sceneQuery = new SceneQuery(bvh->GetBox(), traverser);
+
 
         glutMainLoop();
@@ -270 +274 @@
         glEnable(GL_CULL_FACE);
         //glDisable(GL_CULL_FACE);
-        
+        glDisable(GL_TEXTURE_2D);
 
         GLfloat ambientColor[] = {0.5, 0.5, 0.5, 1.0};
@@ -292 +296 @@
                 "'F3'           - shows/hides bounds (boxes or tight bounds)",
                 "'F4'           - shows/hides statistics",
-                "'F5',          - shows/hides parameters",
+                "'F5',          - toggles between fly / walkmode",
+                "'F6',          - shows/hides parameters",
                 "'SPACE'        - cycles through occlusion culling algorithms",
                 "",
@@ -390 +395 @@
         glEnable(GL_LIGHTING);
         glEnable(GL_LIGHT0);
-        glEnable(GL_LIGHT1);
+        //glEnable(GL_LIGHT1);
+        glDisable(GL_LIGHT1);
 
         //GLfloat ambient[] = {0.5, 0.5, 0.5, 1.0};
@@ -424 +430 @@
 
         glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient);
-        glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);
-        //glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_FALSE);
+        //glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);
+        glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_FALSE);
         //glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL_EXT, GL_SEPARATE_SPECULAR_COLOR_EXT);
         glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL_EXT, GL_SINGLE_COLOR_EXT);
-
-}
+}
+
 
 void SetupEyeView()
@@ -476 +482 @@
 void Display() 
 {
+        Vector3 oldPos = camera->GetPosition();
+
         PerfTimer frameTimer;
-
         frameTimer.Start();
 
@@ -493 +500 @@
                 KeyVerticalMotion(KeyShift());
 
-        
         Vector3 playerPos = camera->GetPosition();
-        //sceneQuery->CalcIntersection(playerPos);
+        
+        if (!flyMode)
+        {
+        Vector3 playerPos = camera->GetPosition();
+
+                bool validIntersect = sceneQuery->CalcIntersection(playerPos);
+
+                if (validIntersect &&
+                        (( playerPos.z - oldPos.z) < bvh->GetBox().Size(2) * 1e-1f))
+                {
         camera->SetPosition(playerPos);
+                }
+        }
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -532 +549 @@
                 break;
         case 32: //space
-                renderMode = (renderMode + 1) % RenderTraverser::NUM_RENDERMODES;
+                renderMode = (renderMode + 1) % RenderTraverser::NUM_TRAVERSAL_TYPES;
                 ResetTraverser();
                 break;
@@ -563 +580 @@
                 break;
         case '8':
-                {
                         eightKeyPressed = true;
-                        KeyVerticalMotion(-KeyShift());
                         break;
-                }
         case '9':
-                {
                         nineKeyPressed = true;
-                        KeyVerticalMotion(+KeyShift());
                         break;
-                }       
         case 'o':
         case 'O':
@@ -581 +592 @@
         case 'a':
         case 'A':
-                {
                         leftKeyPressed = true;
-                        camera->Pitch(KeyRotationAngle());
-                }
                 break;
         case 'd':
         case 'D':
-        {
                         rightKeyPressed = true;
-                        camera->Pitch(-KeyRotationAngle());
-                }
                 break;
         case 'w':
         case 'W':
-                {
                         upKeyPressed = true;
-                        KeyHorizontalMotion(KeyShift());
-                }
                 break;
         case 'x':
         case 'X':
-                {
                         downKeyPressed = true;
-                        KeyHorizontalMotion(-KeyShift());
-                }
                 break;
         case 'r':
@@ -716 +715 @@
         case GLUT_KEY_F5:
                 showOptions = !showOptions;
+                break;
+        case GLUT_KEY_F6:
+                flyMode = !flyMode;
                 break;
         case GLUT_KEY_LEFT:
@@ -1004 +1006 @@
         if (numbers.size() > 0)
         {
-                sprintf_s(hstr, "%d", numbers.back());
+                sprintf(hstr, "%d", numbers.back());
                 str.append(hstr);
         }
@@ -1010 +1012 @@
         for (int i = (int)numbers.size() - 2; i >= 0; i--)
         {
-                sprintf_s(hstr, ",%03d", numbers[i]);
+                sprintf(hstr, ",%03d", numbers[i]);
                 str.append(hstr);
         }
@@ -1050 +1052 @@
                 issuedQueries = traverser->GetStats().mNumIssuedQueries;
                 stateChanges = traverser->GetStats().mNumStateChanges;
-        }
-
-        sprintf_s(msg2, "assumed visible frames: %4d, max batch size: %4d", 
+                numBatches = traverser->GetStats().mNumBatches;
+        }
+
+        sprintf(msg2, "assumed visible frames: %4d, max batch size: %4d", 
                       assumedVisibleFrames, maxBatchSize);
 
-        sprintf_s(msg3, "render queue: %d, multiqueries: %d, tight bounds: %d", 
+        sprintf(msg3, "render queue: %d, multiqueries: %d, tight bounds: %d", 
                       useRenderQueue, useMultiQueries, useTightBounds);
 
@@ -1064 +1067 @@
         CalcDecimalPoint(str2, bvh->GetBvhStats().mTriangles);
 
-        sprintf_s(msg4, "rendered nodes: %6d (of %6d), rendered triangles: %s (of %s)", 
+        sprintf(msg4, "rendered nodes: %6d (of %6d), rendered triangles: %s (of %s)", 
                           renderedNodes, bvh->GetNumVirtualNodes(), str.c_str(), str2.c_str()); 
 
-        sprintf_s(msg5, "traversed: %5d, frustum culled: %5d, query culled: %5d",
+        sprintf(msg5, "traversed: %5d, frustum culled: %5d, query culled: %5d",
                           traversedNodes, frustumCulledNodes, queryCulledNodes);
 
-        sprintf_s(msg6, "issued queries: %5d, state changes: %5d", issuedQueries, stateChanges);
-
-        sprintf_s(msg8, "triangles per virtual leaf: %5d", trianglesPerVirtualLeaf);
-
-        sprintf_s(msg7, "fps: %6.1f", fps);
+        sprintf(msg6, "issued queries: %5d, state changes: %5d, render batches: %5d", issuedQueries, stateChanges, numBatches);
+
+        sprintf(msg8, "triangles per virtual leaf: %5d", trianglesPerVirtualLeaf);
+
+        sprintf(msg7, "fps: %6.1f", fps);
 
 
@@ -1085 +1088 @@
         else
         {
-                glColor3f(1.0f, 1.0f, 1.0f);
+        //      glColor3f(1.0f, 1.0f, 1.0f);
+                glColor3f(1.0f, 0.0f, 0.0f);
                 Output(850, 30, msg[renderMode]);