Changeset 155 for trunk/VUT/work/TestCullingTerrain

Timestamp:

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

Author:

mattausch

Message:

added node traversal interface

Location:

trunk/VUT/work/TestCullingTerrain

Files:

• TerrainFrameListener.cpp (modified) (10 diffs)
• TerrainFrameListener.h (modified) (4 diffs)
• TestCullingTerrainApplication.cpp (modified) (1 diff)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -89 +89 @@
 mShowOctree(false),
 mUseDepthPass(false),
-mUseOptimization(true),
+mTestGeometryForVisibleLeaves(true),
 mShowVisualization(false),
 mCullCamera(false),
@@ -101 +101 @@
 mShowQueryStats(false),
 mQueryManager(NULL),
-mVisibilityManager(NULL)
+mVisibilityManager(NULL),
+mDelayedQueriesIssued(0.0),
+mDelayedTraversedNodes(0.0)
 {
         //mInputDevice = PlatformManager::getSingleton().createInputReader();
@@ -129 +131 @@
         mAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/AlgorithmInfo");
         mThresholdInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/ThresholdInfo");
-        mUseOptimizationInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/UseOptimizationInfo");
+        mTestGeometryForVisibleLeavesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/TestGeometryForVisibleLeavesInfo");
         mUseDepthPassInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/UseDepthPassInfo");
         mAssumedVisibilityInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/AssumedVisibilityInfo");
@@ -140 +142 @@
         mObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/ObjectsInfo");
         mQueriesIssuedInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/QueriesIssuedInfo");
-        
+        mDelayedQueriesIssuedInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/DelayedQueriesIssuedInfo");
+        mDelayedTraversedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/DelayedTraversedNodesInfo");
+
         mAlgorithmInfo->setCaption(": " + currentAlgorithmCaptions[mCurrentAlgorithm]);
         mThresholdInfo->setCaption(": 0");
@@ -149 +153 @@
         mRenderedNodesInfo->setCaption(": 0");
         mObjectsInfo->setCaption(": 0");
-        mUseOptimizationInfo->setCaption(": true");
+        mTestGeometryForVisibleLeavesInfo->setCaption(": true");
         mUseDepthPassInfo->setCaption(": false");
         mQueriesIssuedInfo->setCaption(": 0");
         mAssumedVisibilityInfo->setCaption(": 0");
-
+        mDelayedQueriesIssuedInfo->setCaption(": 0");
+        mDelayedTraversedNodesInfo->setCaption(": 0");
 
         //-- visibility query stats overlay
@@ -170 +175 @@
 
         // set scene manager options
-        mSceneMgr->setOption("UseOptimization", &mUseOptimization);
+        mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
 
         // apply delayed rendering (i.e., transparents after hierarchical culling pass)
         // only if optimization is not used 
-        bool delayRenderTransparents = !mUseOptimization;
+        bool delayRenderTransparents = !mTestGeometryForVisibleLeaves;
 
         mSceneMgr->setOption("DelayRenderTransparents", &delayRenderTransparents);
@@ -736 +741 @@
                 mSceneMgr->getOption("NumFrustumCulledNodes", &opt); sprintf(str,": %d", opt); 
                 mFrustumCulledNodesInfo->setCaption(str);
-        
-                mSceneMgr->getOption("NumQueriesIssued", &opt); sprintf(str,": %d", opt); 
+
+                // delay so there is no jump
+                mSceneMgr->getOption("NumQueriesIssued", &opt); 
+                sprintf(str,": %d", (int)opt); 
                 mQueriesIssuedInfo->setCaption(str);
 
@@ -754 +761 @@
                 sprintf(str,": %d", mTerrainContentGenerator->GetObjectCount()); 
                 mObjectsInfo->setCaption(str);
+
+                // delay so there is no jump
+                mSceneMgr->getOption("NumQueriesIssued", &opt); 
+                mDelayedQueriesIssued = mDelayedQueriesIssued * 0.8 + (float)opt * 0.2;
+                sprintf(str,": %d", (int)mDelayedQueriesIssued); 
+                mDelayedQueriesIssuedInfo->setCaption(str);
+
+                mSceneMgr->getOption("NumTraversedNodes", &opt); 
+                mDelayedTraversedNodes = mDelayedTraversedNodes * 0.8 + (float)opt * 0.2;
+                sprintf(str,": %d", (int)mDelayedTraversedNodes); 
+                mDelayedTraversedNodesInfo->setCaption(str);
+
         }
         catch (...)
@@ -761 +780 @@
 }
 //-----------------------------------------------------------------------
-void TerrainFrameListener::toggleUseOptimization()
-{
-        mUseOptimization = !mUseOptimization;
-        mSceneMgr->setOption("UseOptimization", &mUseOptimization);
+void TerrainFrameListener::toggleTestGeometryForVisibleLeaves()
+{
+        mTestGeometryForVisibleLeaves = !mTestGeometryForVisibleLeaves;
+        mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
         
         // disable optimization which tests geometry instead of aabb
         // for delayed rendering (i.e., render transparents after all the solids)
         // because otherwise visible transparents could be skipped
-        bool delayedRendering = !mUseOptimization;
+        bool delayedRendering = !mTestGeometryForVisibleLeaves;
+
         mSceneMgr->setOption("DelayRenderTransparents", &delayedRendering);
 
-        if (mUseOptimization)
-        {
-                mUseOptimizationInfo->setCaption(": true");
+        if (mTestGeometryForVisibleLeaves)
+        {
+                mTestGeometryForVisibleLeavesInfo->setCaption(": true");
         }
         else
         {
-                mUseOptimizationInfo->setCaption(": false");
+                mTestGeometryForVisibleLeavesInfo->setCaption(": false");
         }
 }
@@ -898 +918 @@
                 toggleDisplayCameraDetails();
                 break;
-        case KC_O:
-                toggleUseOptimization();
+        case KC_G:
+                toggleTestGeometryForVisibleLeaves();
                 break;
         case KC_T:

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.h

@@ -109 +109 @@
     void changeThreshold(int incr);
         void changeAssumedVisibility(int incr);
-        void toggleUseOptimization();
+        void toggleTestGeometryForVisibleLeaves();
         void toggleShowOctree();
         void toggleUseDepthPass();
@@ -159 +159 @@
     OverlayElement *mTraversedNodesInfo;
         OverlayElement *mHierarchyNodesInfo;
-        OverlayElement *mUseOptimizationInfo;
+        OverlayElement *mTestGeometryForVisibleLeavesInfo;
         OverlayElement *mUseDepthPassInfo;
         OverlayElement *mRenderedNodesInfo;
         OverlayElement *mObjectsInfo;
         OverlayElement *mQueriesIssuedInfo;
+        OverlayElement *mDelayedQueriesIssuedInfo;
+        OverlayElement *mDelayedTraversedNodesInfo;
 
         OverlayElement *mQueryTypeInfo;
@@ -175 +177 @@
         TerrainContentGenerator *mTerrainContentGenerator;
 
-        bool mUseOptimization;
+        bool mTestGeometryForVisibleLeaves;
         bool mShowOctree;
         bool mUseDepthPass;
@@ -236 +238 @@
         //bool mUseBufferedInputKeys, mUseBufferedInputMouse, mInputTypeSwitchingOn;
         PlatformQueryManager *mQueryManager;
+
+        float mDelayedQueriesIssued;
+        float mDelayedTraversedNodes;
 };
 

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -162 +162 @@
 
                 // the objects are generated on the whole terrain
-                //mTerrainContentGenerator->GenerateScene(1500, "robot");
-                mTerrainContentGenerator->GenerateScene(1500, "athene");
+                mTerrainContentGenerator->GenerateScene(1500, "robot");
+                //mTerrainContentGenerator->GenerateScene(1500, "athene");
                 //mTerrainContentGenerator->GenerateScene(500, "ninja");
         }