Changeset 1312

Timestamp:

09/01/06 13:48:15 (18 years ago)

Author:

szydlowski

Message:

per-frame-stats with internal rendering - use depth pass issue unresolved

Location:

GTP/trunk

Files:

• App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp (modified) (2 diffs)
• App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTreeAppListener.cpp (modified) (3 diffs)
• Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTree.h (modified) (5 diffs)
• Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeCamera.h (modified) (2 diffs)
• Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp (modified) (11 diffs)
• Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeCamera.cpp (modified) (4 diffs)
• Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (modified) (3 diffs)

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

@@ -623 +623 @@
                 mSceneMgr->setOption("RenderMethod", &mOptions.mRenderMethod);
                 mSceneMgr->setOption("EnhancedVisibility", &mOptions.mEnhancedVisibility);
-                mSceneMgr->setOption("DeleteRenderQueue", &mOptions.mDelRenderQueue);
-                // fix
-                bool depthpass = false;
-                mSceneMgr->setOption("UseDepthPass", &depthpass);
         }
         // set algorithm when scene manager is OCM - numbering is different though
@@ -633 +629 @@
                 int alg = CONV_KDT_TO_OCM_ALG(mOptions.mRenderMethod);
                 mSceneMgr->setOption("Algorithm", &alg);
-                mSceneMgr->setOption("DeleteRenderQueue", &mOptions.mDelRenderQueue);
-        }
+        }
+        bool vizcullnodes = true;
+        mSceneMgr->setOption("VisualizeCulledNodes", &vizcullnodes);
+        mSceneMgr->setOption("DeleteRenderQueue", &mOptions.mDelRenderQueue);
+
+        // fix
+        //bool depthpass = true;
+        //mSceneMgr->setOption("UseDepthPass", &depthpass);
 
         // create ray query for ground intersection

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

@@ -432 +432 @@
 {
         // viewcells apply only for scenes loaded from geometry
-        if (mOptions.mSceneType != ST_GEOMETRY)
+        if (mOptions.mSceneType != ST_GEOMETRY || 
+                mOptions.myApp->getViewCellsFileName().empty())
                 return;
 
@@ -445 +446 @@
                 // call once to load view cell loading overlay
                 mWindow->update();
-                mViewCellsLoaded = mSceneMgr->setOption("LoadViewCells", mOptions.myApp->getViewCellsFileName().c_str());
+                mViewCellsLoaded = mSceneMgr->setOption("LoadViewCells", 
+                        mOptions.myApp->getViewCellsFileName().c_str());
 
                 if (!mViewCellsLoaded)
@@ -746 +748 @@
         {
                 toggleRenderMethod();
+                mTimeUntilNextToggle = 0.5;
+        }
+
+        if (mInputDevice->isKeyDown(KC_V) && mTimeUntilNextToggle <= 0)
+        {
+                toggleEnhancedVisibility();
                 mTimeUntilNextToggle = 0.5;
         }

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTree.h

@@ -483 +483 @@
                 typedef std::set<LeafPtr> LeafSet;
 
-                typedef struct Stats_
+                struct TreeStats
                 {
                         unsigned int mNumNodes;
@@ -494 +494 @@
                                 mNumLeaves = 0;
                                 mNumSceneNodes = 0;
-                        };
-                } Stats;
+                        }
+                };
+
+                struct FrameStats 
+                {
+                        unsigned int mTraversedNodes;
+                        unsigned int mRenderedNodes;
+                        unsigned int mFrustumCulledNodes;
+
+                        void clear(void)
+                        {
+                                mTraversedNodes = 0;
+                                mRenderedNodes = 0;
+                                mFrustumCulledNodes = 0;
+                        }
+                };
 
                 enum RenderMethod
@@ -571 +585 @@
 
                 // self-explanatory ...
-                int getMaxDepth(void) { return mMaxDepth; };
-                const Stats& getStats(void) const { return mStats; };
-                AxisAlignedBox getBox(void) { if (mKdRoot) return mKdRoot->mAABB; else return AxisAlignedBox(); };
+                int getMaxDepth(void) { return mMaxDepth; }
+                const TreeStats& getTreeStats(void) const { return mTreeStats; }
+                const FrameStats& getFramesStats(void) const { return mFrameStats; }
+                AxisAlignedBox getBox(void) { if (mKdRoot) return mKdRoot->mAABB; else return AxisAlignedBox(); }
                 void setBuildMethod(BuildMethod bm) { mBuildMethod = bm; }
         protected:
@@ -627 +642 @@
                 Log * mBuildLog;
 
-                // statistical information
-                Stats mStats;
+                // statistical information on the tree
+                TreeStats mTreeStats;
+
+                // statistical info on a single rendered frame
+                FrameStats mFrameStats;
 
                 /** Visualization flags **/
@@ -638 +656 @@
                 bool mShowNodes;
 
-                // pointer zur getVisibility function (simple oder enhanced)
+                // function pointer to the getVisibility function
+                // allows choosing between regular vis (NONE/PART, same es isVisible)
+                // and enhaced vis (NONE/PART/FULL) for early traversal abort
                 KdTreeCamera::NodeVisibility (KdTreeCamera::*getVisibility)(const AxisAlignedBox& box) const;
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeCamera.h

@@ -28 +28 @@
         };
 
-        //typedef NodeVisibility (KdTreeCamera::*VisFunction)(const AxisAlignedBox& box) const;
-
         // default constructor
         KdTreeCamera(const String& name, SceneManager *sm);
         // default destructor
         ~KdTreeCamera();
-
-        // chage vis mode
-        void setEnhancedVisMode(bool enhanced);
-        // query vis mode
-        bool getEnhancedVisMode(void);
-
-        // function pointer to the actual getvis function
-        // allows choosing between regular vis (NONE/PART, same es isVisible)
-        // and enhaced vis (NONE/PART/FULL) for early traversal abort
-        //NodeVisibility (KdTreeCamera::*getVisibility)(const AxisAlignedBox& box) const;
-        //VisFunction getVisibility;
-        //NodeVisibility getVisibility(const AxisAlignedBox& box ) const;
 
         // regular visibility, like isVisible
@@ -52 +38 @@
         NodeVisibility getVisibilityEnhanced(const AxisAlignedBox& box) const;
 
-        // DEBUG
-        //mutable unsigned int mNumVisQueries;
-protected:
-
-        // flag indicating current vis mode, default is on (true)
-        bool mEnhancedVisMode;
+        // statistical info
+        mutable unsigned int mNumVisQueries;
 };
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp

@@ -877 +877 @@
         unsigned long t1, t2, t3, t4;
 
-        mStats.clear();
+        mTreeStats.clear();
         
         // data we want to collect
@@ -890 +890 @@
         t3 = timer->getMicroseconds(); // DEBUG
 
-        mStats.mNumSceneNodes = nObjects;
+        mTreeStats.mNumSceneNodes = nObjects;
 
         assert(! aabb.isNull() && "Teh stubid worldAABB iz NULL ... waht now?");
@@ -924 +924 @@
         mBuildLog->logMessage("Total time: " + StringConverter::toString(t4 - t1) + "µs");
         mBuildLog->logMessage("Tree Depth: " + StringConverter::toString(mMaxDepth));
-        mBuildLog->logMessage("Number of Objects: " + StringConverter::toString(mStats.mNumSceneNodes));
-        mBuildLog->logMessage("Number of Leaves: " + StringConverter::toString(mStats.mNumLeaves));
-        mBuildLog->logMessage("Number of Nodes: " + StringConverter::toString(mStats.mNumNodes));
+        mBuildLog->logMessage("Number of Objects: " + StringConverter::toString(mTreeStats.mNumSceneNodes));
+        mBuildLog->logMessage("Number of Leaves: " + StringConverter::toString(mTreeStats.mNumLeaves));
+        mBuildLog->logMessage("Number of Nodes: " + StringConverter::toString(mTreeStats.mNumNodes));
         mBuildLog->logMessage("Total cost: " + StringConverter::toString(calcCost()));
         mBuildLog->logMessage("################################");
@@ -1044 +1044 @@
                 }
                 // update stats
-                ++ mStats.mNumNodes;
-                ++ mStats.mNumLeaves;
+                ++ mTreeStats.mNumNodes;
+                ++ mTreeStats.mNumLeaves;
                 // update bounding box
                 leaf->_updateBounds(false);
@@ -1128 +1128 @@
 
                 // update stats
-                ++ mStats.mNumNodes;
+                ++ mTreeStats.mNumNodes;
 
                 // update bounding box
@@ -1196 +1196 @@
                                 topNode = leaf;
                         // update stats
-                        ++ mStats.mNumNodes;
-                        ++ mStats.mNumLeaves;
+                        ++ mTreeStats.mNumNodes;
+                        ++ mTreeStats.mNumLeaves;
                 }
 
@@ -1310 +1310 @@
 
                         // update stats
-                        ++ mStats.mNumNodes;
+                        ++ mTreeStats.mNumNodes;
                 }
 
@@ -1399 +1399 @@
         bool showBoxes, KdTree::NodeList& visibleNodes)
 {
-        // debug
-        //cam->mNumVisQueries = 0;
+        mFrameStats.clear();
+        cam->mNumVisQueries = 0;
 
         if (mKdRoot)
@@ -1406 +1406 @@
                         cam, queue, onlyShadowCasters, showBoxes, visibleNodes);
 
-        //mBuildLog->logMessage("Frame # " + StringConverter::toString(Root::getSingleton().getCurrentFrameNumber()) +
-        //      " ," + StringConverter::toString(cam->mNumVisQueries) + " vis queries");
+        mFrameStats.mTraversedNodes = cam->mNumVisQueries;
 }
 
@@ -1420 +1419 @@
         if (fullVis || 
                 ((vis = (cam->*getVisibility)(node->mAABB)) != KdTreeCamera::KDNV_NONE))
-                //((vis = (cam->*getVisibility)(node->mAABB)) != KdTreeCamera::KDNV_NONE))
         {
                 visibleNodes.push_back(node);
 
                 bool v = (fullVis || vis == KdTreeCamera::KDNV_FULL);
+
                 node->queueVisibleObjects(currentFrame, cam, queue, onlyShadowCasters, showBoxes, v);
+
+                if (v || node->isLeaf())
+                        ++ mFrameStats.mRenderedNodes;
 
                 if (!v)
@@ -1437 +1439 @@
                                 cam, queue, onlyShadowCasters, showBoxes, visibleNodes, v);
                 }
+        }
+        else
+        {
+                ++ mFrameStats.mFrustumCulledNodes;
         }
 }

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeCamera.cpp

@@ -14 +14 @@
 
 KdTreeCamera::KdTreeCamera(const String& name, SceneManager *sm):
-Camera(name, sm), 
-mEnhancedVisMode(true)
+Camera(name, sm)
 {
-        //getVisibility = getVisibilityEnhanced;
+
 }
 
@@ -25 +24 @@
 }
 
-void KdTreeCamera::setEnhancedVisMode(bool enhanced)
-{
-        mEnhancedVisMode = enhanced;
-}
-
-bool KdTreeCamera::getEnhancedVisMode()
-{
-        return mEnhancedVisMode;
-}
-
 //-----------------------------------------------------------------------
 // enhanced vis calculation - borrowed from OctreeCamera - indicate when entire box inside the frustum
 KdTreeCamera::NodeVisibility KdTreeCamera::getVisibilityEnhanced(const AxisAlignedBox& box) const
 {
-        //++ mNumVisQueries;
+        ++ mNumVisQueries;
+        
         // Null boxes always invisible
         if ( box.isNull() )
@@ -98 +88 @@
 KdTreeCamera::NodeVisibility KdTreeCamera::getVisibilitySimple(const AxisAlignedBox& box) const
 {
-        //++ mNumVisQueries;
+        ++ mNumVisQueries;
 
         // dummy
@@ -112 +102 @@
 }
 
-//KdTreeCamera::NodeVisibility KdTreeCamera::getVisibility(const AxisAlignedBox& box) const
-//{
-//      // dummy
-//      FrustumPlane* culledBy = 0;
-//      if (mCullFrustum)
-//      {
-//              return mCullFrustum->isVisible(box, culledBy) ? KDNV_PART : KDNV_NONE;
-//      }
-//      else
-//      {
-//              return Frustum::isVisible(box, culledBy) ? KDNV_PART : KDNV_NONE;
-//      }
-//}
 } // namespace Ogre

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp

@@ -44 +44 @@
 mLeavePassesInQueue(0),
 mDelayRenderTransparents(true),
-mUseDepthPass(true),
+mUseDepthPass(false),
 mIsDepthPassPhase(false),
 mUseItemBuffer(false),
@@ -462 +462 @@
         }
         // vis options
+        else if (strKey == "NumFrustumCulledNodes")
+        {
+                if (mRenderMethod == KdTree::KDRM_INTERNAL)
+                {
+                        unsigned int numnodes = 0;
+                        if (mKdTree)
+                                numnodes = mKdTree->getFramesStats().mFrustumCulledNodes;
+
+                        * static_cast<unsigned int *>(pDestValue) = (unsigned int)numnodes;
+                        return true;
+                }
+                // otherwise let fall through to VisibilityOptionsManager
+        }
+        else if (strKey == "NumQueryCulledNodes")
+        {
+                if (mRenderMethod == KdTree::KDRM_INTERNAL)
+                {
+                        * static_cast<unsigned int *>(pDestValue) = 0;
+                        return true;
+                }
+                // otherwise let fall through to VisibilityOptionsManager
+        }
         else if (strKey == "NumHierarchyNodes")
         {
                 unsigned int numnodes = 0;
                 if (mKdTree)
-                        numnodes = mKdTree->getStats().mNumNodes;
+                        numnodes = mKdTree->getTreeStats().mNumNodes;
 
                 * static_cast<unsigned int *>(pDestValue) = (unsigned int)numnodes;
                 return true;
+        }
+        else if (strKey == "NumRenderedNodes")
+        {
+                if (mRenderMethod == KdTree::KDRM_INTERNAL)
+                {
+                        unsigned int numnodes = 0;
+                        if (mKdTree)
+                                numnodes = mKdTree->getFramesStats().mRenderedNodes;
+
+                        * static_cast<unsigned int *>(pDestValue) = (unsigned int)numnodes;
+                        return true;
+                }
+                // otherwise let fall through to VisibilityOptionsManager
+        }
+        else if (strKey == "NumQueriesIssued")
+        {
+                if (mRenderMethod == KdTree::KDRM_INTERNAL)
+                {
+                        * static_cast<unsigned int *>(pDestValue) = 0;
+                        return true;
+                }
+                // otherwise let fall through to VisibilityOptionsManager
+        }
+        else if (strKey == "NumTraversedNodes")
+        {
+                if (mRenderMethod == KdTree::KDRM_INTERNAL)
+                {
+                        unsigned int numnodes = 0;
+                        if (mKdTree)
+                                numnodes = mKdTree->getFramesStats().mTraversedNodes;
+
+                        * static_cast<unsigned int *>(pDestValue) = (unsigned int)numnodes;
+                        return true;
+                }
+                // otherwise let fall through to VisibilityOptionsManager
         }
         else if (strKey == "VisibilityManager")
@@ -1357 +1414 @@
                 << "Use optimization: " << StringConverter::toString(mHierarchyInterface->GetTestGeometryForVisibleLeaves()) << ", "
                 << "Algorithm type: " << mVisibilityManager->GetCullingManagerType() << ", "
-                << "Hierarchy nodes: " << (mKdTree ? mKdTree->getStats().mNumNodes : 0) << ", " 
+                << "Hierarchy nodes: " << (mKdTree ? mKdTree->getTreeStats().mNumNodes : 0) << ", " 
                 << "Traversed nodes: " << mHierarchyInterface->GetNumTraversedNodes() << ", "
                 << "Rendered nodes: " << mHierarchyInterface->GetNumRenderedNodes() << ", "