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

Timestamp:

08/03/06 17:25:01 (18 years ago)

Author:

szydlowski

Message:

all functions for CHC implemented in KdTreeSceneManager?, however CHC not working yet, many issues to resolve

File:

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

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

@@ -332 +332 @@
         {
 #ifdef KDTREE_DEBUG
-                try
+                MaterialPtr mp = MaterialManager::getSingleton().getByName("aabbHiLite");
+                if (mp.isNull())
                 {
                         ColourValue cv(0.0, 1.0, 0.0);
@@ -339 +340 @@
                         mp->setDiffuse(cv);
                 }
-                catch (Ogre::Exception&)
-                {
-                        // SO FUCKING DON'T CARE !!!
-                }
+                //try
+                //{
+                //      ColourValue cv(0.0, 1.0, 0.0);
+                //      MaterialPtr mp = MaterialManager::getSingleton().create("aabbHiLite","General");
+                //      mp->setSelfIllumination(cv);
+                //      mp->setDiffuse(cv);
+                //}
+                //catch (Ogre::Exception&)
+                //{
+                //      // SO FUCKING DON'T CARE !!!
+                //}
 #endif
                 try
@@ -645 +653 @@
                 unsigned long t1, t2, t3, t4;
                 //AxisAlignedBox aabb;
+
+                mStats.clear();
                 
                 // data we want to collect
@@ -657 +667 @@
                 t3 = timer->getMicroseconds(); // DEBUG
 
+                mStats.mNumSceneNodes = nObjects;
                 // <DEBUG>
                 //lm->logMessage("# of perfect splits " + StringConverter::toString(events.size()));
@@ -685 +696 @@
                 t4 = timer->getMicroseconds(); // DEBUG
 
+                String method = "Invalid";
+                if (mBuildMethod == KDBM_RECURSIVE)
+                        method = "Recursive";
+                else if (mBuildMethod == KDBM_PRIORITYQUEUE)
+                        method = "Priority Queue";
+
                 mBuildLog->logMessage("######## SAH Statistics ########");
+                mBuildLog->logMessage("Build Method: " + method);
                 mBuildLog->logMessage("Time for events build: " + StringConverter::toString(t2 - t1) + "µs");
                 mBuildLog->logMessage("Time for events sort: " + StringConverter::toString(t3 - t2) + "µs");
                 mBuildLog->logMessage("Time for tree build: " + StringConverter::toString(t4 - t3) + "µs");
                 mBuildLog->logMessage("Total time: " + StringConverter::toString(t4 - t1) + "µs");
-                mBuildLog->logMessage("######## SAH Statistics ########");
-                calcCost();
+                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("Total cost: " + StringConverter::toString(calcCost()));
+                mBuildLog->logMessage("################################");
         }
 
@@ -847 +868 @@
                                 it++;
                         }
+                        // update stats
+                        ++ mStats.mNumNodes;
+                        ++ mStats.mNumLeaves;
                         return leaf;
                 }
@@ -930 +954 @@
                                 branch->mRight = recBuild(eventsRight, nBothS + nRightS, best.bright, branch);
                         }
+
+                        // update stats
+                        ++ mStats.mNumNodes;
 
                         //assert(branch->mRight || branch->mLeft);
@@ -1008 +1035 @@
                                 if (!topNode)
                                         topNode = leaf;
+                                // update stats
+                                ++ mStats.mNumNodes;
+                                ++ mStats.mNumLeaves;
                         }
 
@@ -1172 +1202 @@
 #endif
                                 }
+                                // cleanup
+                                else
+                                {
+                                        delete eventsLeft;
+                                }
                                 if (eventsRight->size() > 0)
                                 {
@@ -1193 +1228 @@
 #endif
                                 }
+                                // cleanup
+                                else
+                                {
+                                        delete eventsRight;
+                                }
 
                                 newNode = branch;
                                 if (!topNode)
                                         topNode = branch;
+
+
+                                // update stats
+                                ++ mStats.mNumNodes;
                         }
 
@@ -1385 +1429 @@
         }
 
-        void KdTree::calcCost()
-        {
-                Real cost = 0;
+        Real KdTree::calcCost()
+        {
                 if (mKdRoot)
-                        cost = calcCost(mKdRoot, PlaneEvent::surfaceArea(mKdRoot->mAABB));
-
-                //LogManager::getSingleton().logMessage("#@#@#@ One KdTree: €" + StringConverter::toString(cost));
-                mBuildLog->logMessage("#@#@#@ One KdTree: €" + StringConverter::toString(cost));
+                        return calcCost(mKdRoot, PlaneEvent::surfaceArea(mKdRoot->mAABB));
+                else
+                        return 0;
         }