Changeset 87 for trunk/VUT/work/TestCullingTerrain

Timestamp:

05/09/05 01:24:02 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/work/TestCullingTerrain

Files:

• TerrainContentGenerator.cpp (modified) (1 diff)
• TestCullingTerrainApplication.cpp (modified) (9 diffs)
• TestCullingTerrainApplication.h (modified) (3 diffs)

trunk/VUT/work/TestCullingTerrain/TerrainContentGenerator.cpp

@@ -50 +50 @@
 //-----------------------------------------------------------------------
 TerrainContentGenerator::TerrainContentGenerator(SceneManager *sm):
-SceneContentGenerator(sm), mMaxHeight(100)
+SceneContentGenerator(sm), mMaxHeight(50)
 {
         mMinPos = Vector3(0.0f, 5000.0f, 0.0f);

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -96 +96 @@
 
         mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr);
-        
-        mTerrainContentGenerator->GenerateScene(500, "ninja.mesh");
-        mTerrainContentGenerator->GenerateScene(500, "robot.mesh");
+//      mTerrainContentGenerator->GenerateScene(500, "ninja.mesh");
+        mTerrainContentGenerator->GenerateScene(1000, "robot.mesh");
 
         // no limitations needed anymore: the user can set 
@@ -150 +149 @@
 mTerrainContentGenerator(sceneGenerator),
 mVisibilityThreshold(0),
-mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING)
+mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING),
+mShowOctree(true),
+mUseCulling(false)
 {
         // Reduce move speed
@@ -174 +175 @@
         mHierarchyNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/HierarchyNodesInfo");
         mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/RenderedNodesInfo");
-        mNumObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/NumObjectsInfo");
+        mObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/ObjectsInfo");
         mUseOptimizationInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/UseOptimizationInfo");
-
+        mQueriesIssuedInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/QueriesIssuedInfo");
+        
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
         mThresholdInfo->setCaption(": 0");
@@ -184 +186 @@
         mHierarchyNodesInfo->setCaption(": 0");
         mRenderedNodesInfo->setCaption(": 0");
-        mNumObjectsInfo->setCaption(": 0");
+        mObjectsInfo->setCaption(": 0");
         mUseOptimizationInfo->setCaption(": true");
+        mQueriesIssuedInfo->setCaption(": 0");
 
         setAlgorithm(mCurrentAlgorithm);
         toggleUseOptimization();
         toggleShowOctree();
+        toggleUseCulling();
 
     pOver->show();
@@ -301 +305 @@
         KEY_PRESSED(KC_O, 0.3, toggleUseOptimization());
         KEY_PRESSED(KC_S, 0.3, toggleShowOctree());
-        //KEY_PRESSED(KC_T, 1, change);
-      
-        changeStats();
+        KEY_PRESSED(KC_C, 0.3, toggleUseCulling());
+              
+        updateStats();
 
     return ExampleFrameListener::frameStarted(evt) && ExampleFrameListener::frameEnded(evt);        
@@ -329 +333 @@
 void MouseQueryListener::setAlgorithm(int algorithm)
 {
-        //OutputDebugString("changing algorithm\n");
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
         mSceneMgr->setOption("Algorithm", &mCurrentAlgorithm);
 }
 //-----------------------------------------------------------------------
-void MouseQueryListener::changeStats()
+void MouseQueryListener::updateStats()
 {
         unsigned int opt = 0;
@@ -342 +345 @@
         mFrustumCulledNodesInfo->setCaption(str);
         
+        mSceneMgr->getOption("NumQueriesIssued", &opt); sprintf(str,": %d", opt); 
+        mQueriesIssuedInfo->setCaption(str);
+        
         mSceneMgr->getOption("NumQueryCulledNodes", &opt); sprintf(str,": %d", opt); 
         mQueryCulledNodesInfo->setCaption(str);
@@ -355 +361 @@
 
         sprintf(str,": %d", mTerrainContentGenerator->GetObjectCount()); 
-        mNumObjectsInfo->setCaption(str);
+        mObjectsInfo->setCaption(str);
 }
 //-----------------------------------------------------------------------
@@ -375 +381 @@
 
         mSceneMgr->setOption("ShowOctree", &mShowOctree);
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::toggleUseCulling()
+{
+        mUseCulling = !mUseCulling;
+
+        mSceneMgr->setOption("UseCulling", &mUseCulling);
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -62 +62 @@
         void setAlgorithm(int algorithm);
         void changeThreshold(int incr);
-        void changeStats();
+        void updateStats();
         void toggleUseOptimization();
         void toggleShowOctree();
+        void toggleUseCulling();
 
 protected:
@@ -84 +85 @@
         OverlayElement *mUseOptimizationInfo;
         OverlayElement *mRenderedNodesInfo;
-        OverlayElement *mNumObjectsInfo;
+        OverlayElement *mObjectsInfo;
+        OverlayElement *mQueriesIssuedInfo;
 
         SceneNode *mCurrentObject;         // The newly created object
@@ -94 +96 @@
         bool mUseOptimization;
         bool mShowOctree;
+        bool mUseCulling;
 };