Changeset 2455 for GTP/trunk/App/Demos/Vis

Timestamp:

06/14/07 17:24:08 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis

Files:

• HillyTerrain/OGRE/TerrainFrameListener.cpp (modified) (14 diffs)
• HillyTerrain/OGRE/TerrainFrameListener.h (modified) (8 diffs)
• HillyTerrain/OGRE/TestCullingTerrainApplication.cpp (modified) (3 diffs)
• KdTreeDemo/OGRE/include/TestKdTreeAppListener.h (modified) (1 diff)
• KdTreeDemo/OGRE/src/TestKdTreeAppListener.cpp (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.cpp

@@ -135 +135 @@
 mUseDepthPass(false),
 mTestGeometryForVisibleLeaves(false),
+mTestGeometryBounds(false),
 mShowVisualization(false),
 mCullCamera(false),
@@ -165 +166 @@
 mUseViewCells(false),
 mViewCellsLoaded(false),
-mUseVisibilityFilter(false),
 mFloorDist(2),
 mFlushQueue(false),
@@ -171 +171 @@
 m_iBoundingBoxLevel(0)
 {
-        //mInputDevice = PlatformManager::getSingleton().createInputReader();
-        //mInputDevice->initialise(win, true, true);
-
         mEventProcessor = new EventProcessor();
         
@@ -242 +239 @@
         // the scale factor for the visualized bounding boxes
         mSceneMgr->setOption("NodeVizScale", &mVizScale);
-        
-        /////////
-        //-- set the current culling algorithm type
-        //setAlgorithm(mApplication->mAlgorithm);
+
+        int assumedIncr;
+        mSceneMgr->getOption("AssumedVisibility", &assumedIncr);
+        changeAssumedVisibility(assumedIncr);
+
+        /////
+        // test geometry boundaries instead bounding box
+        mSceneMgr->getOption("TestGeometryBounds", &mTestGeometryBounds);
+        setTestGeometryBounds(mTestGeometryBounds);
+
+        /////////////////////////////////
+        // culling algorithm
 
         bool isNormalExecution;
                 
         mSceneMgr->getOption("NormalExecution", &isNormalExecution);
+        
         if (isNormalExecution)
         {
                 // no algorithm
-                mCurrentAlgorithm = 
-                        GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS;
+                mCurrentAlgorithm = GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS;
         }
         else
@@ -261 +266 @@
         }
         
+        // apply the chosen culling algorithm
         applyCurrentAlgorithm();
         
+
         ///////////////////////////////
-
         // set scene manager options
+        
+        //////////
+        mSceneMgr->getOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
         setTestGeometryForVisibleLeaves(mTestGeometryForVisibleLeaves);
 
-        //mSceneMgr->setOption("UseDepthPass", &mUseDepthPass);
+        /////////////
         mSceneMgr->getOption("UseDepthPass", &mUseDepthPass);
 
@@ -278 +287 @@
         mSceneMgr->getOption("FlushQueue", &mFlushQueue);
         
+        //////////
         if (mFlushQueue)
                 LogManager::getSingleton().logMessage("initial setting: flushing queue");
@@ -283 +293 @@
                 LogManager::getSingleton().logMessage("initial setting: not flushing queue");
 
+        /////////////
         mSceneMgr->setOption("ShowOctree", &mShowOctree);
         mSceneMgr->setOption("ShowViewCells", &mShowViewCells);
@@ -290 +301 @@
         applyObjectType();
 
-        // initialise timer
+
+        ///////////////
+        // initialize timer
+
         mTimer = Root::getSingleton().getTimer();
         mTimeFrameEnded = mTimeFrameStarted = mTimer->getMilliseconds();
         
-        // init view cell parameters
-        mSceneMgr->setOption("UseVisibilityFilter", &mUseVisibilityFilter);
-
         // reset statistics
         mWalkthroughStats.Reset();
@@ -863 +874 @@
                 mFrameInfo.push_back(info);
                 
-                // std::stringstream d; d << StringConverter::toString(info.position) << " " << StringConverter::toString(info.orientation);
-                // LogManager::getSingleton().logMessage(d.str());
                 ++ i;
         }
@@ -892 +901 @@
                 // we produced precomputed fps during the last replay =>
                 // save them to file
-                if (mSavePrecomputedFps) //!mPrecomputedFpsFrameInfo.empty())
+                if (mSavePrecomputedFps)
                 {
                         std::string filename = msApprevAlgorithmCaptions[mCurrentAlgorithm] + "_frames.out";
@@ -997 +1006 @@
 
         if (mAssumedVisibility < 0) 
-        {       
                 mAssumedVisibility = 0;
-        }
 
         char str[100]; sprintf(str,": %d", mAssumedVisibility);
@@ -1229 +1236 @@
         mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
         
-        /* disable optimization which tests geometry instead of aabb
-         * for "delayed" rendering of transparents (i.e., render transparents after all the solids)
-         * because otherwise visible transparents could be skipped
-         */
-        bool delayedRendering = !mTestGeometryForVisibleLeaves;
-
-        mSceneMgr->setOption("DelayRenderTransparents", &delayedRendering);
-
+        // disable optimization for transparent objects, becaue otherwise visible 
+        // transparents could be skipped
         if (mTestGeometryForVisibleLeaves)
-        {
                 mTestGeometryForVisibleLeavesInfo->setCaption(": true");
-        }
         else
-        {
                 mTestGeometryForVisibleLeavesInfo->setCaption(": false");
-        }
-}
+}
+//-----------------------------------------------------------------------
+void TerrainFrameListener::setTestGeometryBounds(bool testGeometryBounds)
+{
+        mSceneMgr->setOption("TestGeometryBounds", &mTestGeometryBounds);
+        
+        if (mTestGeometryBounds)
+                LogManager::getSingleton().logMessage("Testing geometry boundaries");
+        else
+                LogManager::getSingleton().logMessage("Testing bounding box of hierarchy node");
+}
+
 //-----------------------------------------------------------------------
 void TerrainFrameListener::toggleShowOctree()
@@ -1293 +1301 @@
 }
 //-----------------------------------------------------------------------
-void TerrainFrameListener::toggleUseVisibilityFilter()
-{
-        mUseVisibilityFilter = !mUseVisibilityFilter;
-        mSceneMgr->setOption("UseVisibilityFilter", &mUseVisibilityFilter);
-}
-//-----------------------------------------------------------------------
 void TerrainFrameListener::toggleUseDepthPass()
 {
@@ -1485 +1487 @@
                 break;
         case KC_Q:
-                toggleUseVisibilityFilter();
+                mTestGeometryBounds = !mTestGeometryBounds;
+                setTestGeometryBounds(mTestGeometryBounds);
                 break;
         case KC_R:

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.h

@@ -224 +224 @@
         void changeAssumedVisibility(int incr);
         void changeVizScale(const int incr);
+        
         void setTestGeometryForVisibleLeaves(bool testGeometryForVisibleLeaves);
+        
+        void setTestGeometryBounds(bool testGeometryBounds);
+
         /** Shows visualization of octree hierarchy nodes.
         */
         void toggleShowOctree();
+
         /** Shows visualization of the view cells.
         */
         void toggleShowViewCells();
+        
         /** Toggles between view cells / no view cells.
         */
         void toggleUseViewCells();
-
-        void toggleUseVisibilityFilter();
 
         /** Toggles whether we use the initial depth pass.
@@ -372 +376 @@
         OverlayElement *mQueryGeometryVisibilityInfo;
         OverlayElement *mQueryPatchVisibilityInfo;
-        //OverlayElement *mHelpInfo;
 
         RayQueryExecutor *mRayQueryExecutor;
@@ -378 +381 @@
 
         bool mTestGeometryForVisibleLeaves;
+        bool mTestGeometryBounds;
+
         bool mShowOctree;
         bool mShowViewCells;
@@ -389 +394 @@
         bool mShowHelp;
         bool mStatsOn;
+        
+
+        ////////
+        //-- true if the mouse buttons are down
+        
         bool mLMouseDown;
-        // True if the mouse buttons are down
         bool mRMouseDown;    
         bool mShutdownRequested;
@@ -397 +406 @@
         bool mUseAnimation;
         
+
         int mItemBufferMode;
 
@@ -410 +420 @@
         
         Real mReplayTimeElapsed;
-        //EventProcessor* mEventProcessor;
     InputReader* mInputDevice;
     Camera* mCamera;
@@ -446 +455 @@
         bool mShowQueryStats;
         
-        //bool mUseBufferedInputKeys, mUseBufferedInputMouse, mInputTypeSwitchingOn;
         PlatformQueryManager *mQueryManager;
 
@@ -467 +475 @@
         bool mUseViewCells;
         bool mViewCellsLoaded;
-        bool mUseVisibilityFilter;
 
         float mFloorDist;

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp

@@ -25 +25 @@
 
 
-//using namespace GtpVisibility;
 
 /*************************************************************/
@@ -478 +477 @@
                 if (0) generateScene(1000, 2); // create trees
         }
-        int MaxDepth=30;
-        mSceneMgr->setOption("BiHierarchyMaxDepth", &MaxDepth);
-        int Mode=1;
-        mSceneMgr->setOption("EnhancedVisibility", &Mode);
+
+        int maxDepth = 30;
+        
+        mSceneMgr->setOption("BiHierarchyMaxDepth", &maxDepth);
+        
+        int mode = 1;
+        
+        mSceneMgr->setOption("EnhancedVisibility", &mode);
         mSceneMgr->setOption("RebuildBiHierarchy", NULL);
         mSceneMgr->setOption("RebuildKdTree", NULL);
@@ -509 +512 @@
         //-- add animation state for new robots (located at the end of the list)
         
-        for (int i = (int)entList->size() - num; i < (int)entList->size(); ++i)
+        for (size_t i = entList->size() - (unsigned int)num; i < entList->size(); ++ i)
         {
                 mEntityStates.push_back(new EntityState((*entList)[i], 

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTreeAppListener.h

@@ -78 +78 @@
                 NODEVIZ_RENDER_NODES, 
                 NODEVIZ_RENDER_NODES_AND_CONTENT, 
+                NODEVIZ_RENDER_PVS,
                 NODEVIZ_MODES_NUM
         };

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTreeAppListener.cpp

@@ -517 +517 @@
                 mSceneMgr->setOption("RenderNodesForViz", &renderNodesForViz);
                 mSceneMgr->setOption("RenderNodesContentForViz", &renderNodesContentForViz);
-                mSceneMgr->setOption("RenderPvsForViz", &renderPvs);
+                mSceneMgr->setOption("RenderPvsForViz", &renderPvsForViz);
 
         }
@@ -1779 +1779 @@
                         for (size_t i = 0; i < mDemoFPS.size(); i ++)
                         {
-                                logheader << (i+1) << fs;
+                                logheader << (i + 1) << fs;
                         }
                         // minFPS, avgFPS, maxFPS, frames, time, render system, comment, record separator