Changeset 1312 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp

Timestamp:

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

Author:

szydlowski

Message:

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

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp (modified) (11 diffs)

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;
         }
 }