Changeset 155 for trunk/VUT/work/TestCulling

Timestamp:

07/05/05 18:35:47 (19 years ago)

Author:

mattausch

Message:

added node traversal interface

Location:

trunk/VUT/work/TestCulling

Files:

• TestCullingApplication.cpp (modified) (5 diffs)
• TestCullingApplication.h (modified) (2 diffs)

trunk/VUT/work/TestCulling/TestCullingApplication.cpp

@@ -112 +112 @@
 mShowOctree(false),
 mUseDepthPass(false),
-mUseOptimization(true),
+mTestGeometryForVisibleLeaves(true),
 mShowVisualization(false),
 mVisualizeCulledNodes(false)
@@ -137 +137 @@
         mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/RenderedNodesInfo");
         mObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/ObjectsInfo");
-        mUseOptimizationInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/UseOptimizationInfo");
+        mTestGeometryForVisibleLeavesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/TestGeometryForVisibleLeavesInfo");
         mQueriesIssuedInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/QueriesIssuedInfo");
+        
 
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
@@ -148 +149 @@
         mRenderedNodesInfo->setCaption(": 0");
         mObjectsInfo->setCaption(": 0");
-        mUseOptimizationInfo->setCaption(": true");
+        mTestGeometryForVisibleLeavesInfo->setCaption(": true");
         mQueriesIssuedInfo->setCaption(": 0");
+        
 
         setAlgorithm(mCurrentAlgorithm);
         
-        mSceneMgr->setOption("UseOptimization", &mUseOptimization);
+        mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
         mSceneMgr->setOption("UseDepthPass", &mUseDepthPass);
         mSceneMgr->setOption("ShowVizualisation", &mShowVisualization);
@@ -236 +238 @@
         KEY_PRESSED(KC_SUBTRACT, 0, changeThreshold(-10));
         KEY_PRESSED(KC_ADD, 0, changeThreshold(10));
-        KEY_PRESSED(KC_O, 0.3, toggleUseOptimization());
+        KEY_PRESSED(KC_O, 0.3, toggleTestGeometryForVisibleLeaves());
         KEY_PRESSED(KC_C, 0.3, toggleUseDepthPass());
         KEY_PRESSED(KC_V, 0.3, toggleShowViz());
@@ -264 +266 @@
 }
 //-----------------------------------------------------------------------
-void TerrainFrameListener::toggleUseOptimization()
-{
-        mUseOptimization = !mUseOptimization;
-
-        mSceneMgr->setOption("UseOptimization", &mUseOptimization);
-
-        if(mUseOptimization)
-                mUseOptimizationInfo->setCaption(": true");
+void TerrainFrameListener::toggleTestGeometryForVisibleLeaves()
+{
+        mTestGeometryForVisibleLeaves = !mTestGeometryForVisibleLeaves;
+
+        mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
+
+        if(mTestGeometryForVisibleLeaves)
+                mTestGeometryForVisibleLeavesInfo->setCaption(": true");
         else
-                mUseOptimizationInfo->setCaption(": false");
+                mTestGeometryForVisibleLeavesInfo->setCaption(": false");
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCulling/TestCullingApplication.h

@@ -64 +64 @@
         void changeThreshold(int incr);
         void updateStats();
-        void toggleUseOptimization();
+        void toggleTestGeometryForVisibleLeaves();
         void toggleShowOctree();
         void toggleUseDepthPass();
@@ -87 +87 @@
         OverlayElement *mRenderedNodesInfo;
         OverlayElement *mObjectsInfo;
-        OverlayElement *mUseOptimizationInfo;
+        OverlayElement *mTestGeometryForVisibleLeavesInfo;
         OverlayElement *mQueriesIssuedInfo;
 
         SceneContentGenerator *mSceneContentGenerator;
 
-        bool mUseOptimization;
+        bool mTestGeometryForVisibleLeaves;
         bool mShowOctree;
         bool mUseDepthPass;