Changeset 1175 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Timestamp:

08/01/06 16:55:06 (18 years ago)

Author:

szydlowski

Message:

slow but steady progress on kdtree scene manager

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Files:

• OgreKdTreeSceneManager.cpp (modified) (6 diffs)
• OgreVisibilityOptionsManager.cpp (modified) (1 diff)

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

@@ -9 +9 @@
 
 #include <OgreCamera.h>
+#include <OgreSubEntity.h>
 #include "OgreKdTreeSceneManager.h"
 #include "OgreKdTreeSceneNode.h"
 #include "OgreKdTree.h"
+#include "OgreVisibilityOptionsManager.h"
 
 #include <OgreLogManager.h>
@@ -19 +21 @@
 {
         KdTreeSceneManager::KdTreeSceneManager(const String& name, GtpVisibility::VisibilityManager *vm):
-                SceneManager(name), mKdTree(0), mVisibilityManager(vm)
+                SceneManager(name), 
+                mVisibilityManager(vm), 
+                mKdTree(0), 
+                mMaxDepth(KDTREE_MAX_DEPTH),
+                mShowBoxes(false),
+#ifdef KDTREE_DEBUG
+                mHighlighLevel(0),
+                mShowAllBoxes(false),
+#endif
+                mBuildMethod(KdTree::KDBM_PRIORITYQUEUE),
+                mRenderMethod(KdTree::KDRM_RECURSE),
+                mLeavePassesInQueue(0),
+                mCurrentEntityId(1)
         {
                 // Replace root node with my node
@@ -26 +40 @@
                 mSceneRoot = new KdTreeSceneNode(this, "root node");
                 mSceneRoot->_notifyRootNode();
-
-                mMaxDepth = KDTREE_MAX_DEPTH;
-                mShowBoxes = false;
-
-                // kill the old kd-tree if exists 
-                OGRE_DELETE(mKdTree);
-
-                mRenderMethod = KdTree::KDRM_RECURSE;
-
-                //mBuildMethod = KdTree::KDBM_RECURSIVE;
-                mBuildMethod = KdTree::KDBM_PRIORITYQUEUE;
-#ifdef KDTREE_DEBUG
-                mHighlighLevel = 0;
-                mShowAllBoxes = false;
-#endif
 
                 mHierarchyInterface = new KdTreeHierarchyInterface(this, mDestRenderSystem);
@@ -197 +196 @@
                 }
 
-                return SceneManager::setOption(strKey, pValue);
+                return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface)
+                        .setOption(strKey, pValue) || SceneManager::setOption(strKey, pValue);
         }
 
@@ -269 +269 @@
                 }
 
-                return SceneManager::getOption(strKey, pDestValue);
+                return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface)
+                        .getOption(strKey, pDestValue) || SceneManager::getOption(strKey, pDestValue);
+        }
+
+        bool KdTreeSceneManager::getOptionKeys(StringVector &refKeys)
+        {
+                refKeys.push_back("BuildMethod");
+                refKeys.push_back("KI");
+                refKeys.push_back("KT");
+                refKeys.push_back("KdTreeMaxDepth");
+                refKeys.push_back("RebuildKdTree");
+                refKeys.push_back("RenderMethod");
+                refKeys.push_back("ShowKdTree");
+                refKeys.push_back("TreeBox");
+#ifdef KDTREE_DEBUG
+                refKeys.push_back("HighlightLevel");
+                refKeys.push_back("ShowAllBoxes");
+#endif
+                return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface)
+                        .getOptionKeys(refKeys);
+        }
+
+        bool KdTreeSceneManager::getOptionValues(const String & key, StringVector &refValueList)
+        {
+                return SceneManager::getOptionValues(key, refValueList);
+        }
+
+        void KdTreeSceneManager::setVisibilityManager(GtpVisibility::VisibilityManager *visManager)
+        {
+                mVisibilityManager = visManager;
+        }
+
+        GtpVisibility::VisibilityManager * KdTreeSceneManager::getVisibilityManager()
+        {
+                return mVisibilityManager;
+        }
+
+        GtpVisibility::VisibilityManager * KdTreeSceneManager::GetVisibilityManager()
+        {
+                return mVisibilityManager;
+        }
+
+        KdTreeHierarchyInterface * KdTreeSceneManager::GetHierarchyInterface()
+        {
+                return mHierarchyInterface;
         }
 
@@ -294 +338 @@
                 mSceneNodes[sn->getName()] = sn;
                 return sn;
+        }
+
+        Entity * KdTreeSceneManager::createEntity(const String& entityName, const String& meshName)
+        {
+                Entity *ent = SceneManager::createEntity(entityName, meshName);
+
+                for (int i = 0; i < (int)ent->getNumSubEntities(); ++i)
+                {
+                        ent->getSubEntity(i)->setId(mCurrentEntityId);
+                }
+
+                // increase counter of entity id values
+                ++ mCurrentEntityId;
+
+                return ent;
         }
 

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

@@ -82 +82 @@
         refKeys.push_back("NumQueryCulledNodes");
         refKeys.push_back("NumFrustumCulledNodes");
+        refKeys.push_back("NumQueriesIssued");
         
         return true;