Changeset 1285 for GTP/trunk/Lib/Vis/OnlineCullingCHC

Timestamp:

08/25/06 17:44:02 (18 years ago)

Author:

szydlowski

Message:

saving and loading entities to file

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreKdTreeSceneManager.h (modified) (1 diff)
• src/OgreKdTree.cpp (modified) (5 diffs)
• src/OgreKdTreeSceneManager.cpp (modified) (1 diff)

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

@@ -63 +63 @@
         /** Overide from scene manager to destroy kdtree properly (before the scene graph is destroyed)
         */
-        virtual void clearScene()
-        {
-                // DEBUG
-                //if (mKdTree)
-                //      mKdTree->dump();
-
-                // must happen before actual scene is cleared
-                OGRE_DELETE(mKdTree);
-
-                SceneManager::clearScene();
-        }
+        virtual void clearScene();
 
         /************************************************************************/

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

@@ -1273 +1273 @@
         void KdTree::dump()
         {
-                LogManager::getSingleton().logMessage("#@#@#@#@ Dumping KdTree #@#@#@#@");
+                //LogManager::getSingleton().logMessage("#@#@#@#@ Dumping KdTree #@#@#@#@");
+                mBuildLog->logMessage("#@#@#@#@ Dumping KdTree #@#@#@#@");
                 if (mKdRoot)
                         dump(mKdRoot);
@@ -1281 +1282 @@
         void KdTree::dump(KdTree::Node * node)
         {
-                LogManager * log = LogManager::getSingletonPtr();
+                //LogManager * log = LogManager::getSingletonPtr();
                 KdTreeSceneNode * scenenode;
                 String pad;
@@ -1300 +1301 @@
                         {
                                 scenenode = dynamic_cast<KdTreeSceneNode *>(*it);
-                                log->logMessage(pad + "# Leaf   level " + 
+                                mBuildLog->logMessage(pad + "# Leaf   level " + 
                                         StringConverter::toString(node->getLevel()) + 
                                         " SceneNode " + scenenode->getName());
-                                log->logMessage(pad + "## Objects: " + scenenode->dumpToString());
+                                mBuildLog->logMessage(pad + "## Objects: " + scenenode->dumpToString());
                                 it++;
                         }
@@ -1312 +1313 @@
                         if (branch->mLeft)
                         {
-                                log->logMessage(pad + "# Branch level " + 
+                                mBuildLog->logMessage(pad + "# Branch level " + 
                                         StringConverter::toString(node->getLevel()) + " Left Child");
                                 dump(branch->mLeft);
@@ -1318 +1319 @@
                         if (branch->mRight)
                         {
-                                log->logMessage(pad + "# Branch level " + 
+                                mBuildLog->logMessage(pad + "# Branch level " + 
                                         StringConverter::toString(node->getLevel()) + " Right Child");
                                 dump(branch->mRight);

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

@@ -67 +67 @@
         delete mKdTree;
 }
+
+void KdTreeSceneManager::clearScene()
+{
+        // DEBUG
+        if (mKdTree)
+                mKdTree->dump();
+
+        // must happen before actual scene is cleared
+        OGRE_DELETE(mKdTree);
+
+        SceneManager::clearScene();
+}
+
 
 const String& KdTreeSceneManager::getTypeName(void) const