Changeset 1220 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp

Timestamp:

08/18/06 17:25:57 (18 years ago)

Author:

szydlowski

Message:

 

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (modified) (6 diffs)

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

@@ -51 +51 @@
 mIsHierarchicalCulling(false)
 {
-// Replace root node with my node
-OGRE_DELETE(mSceneRoot);
-
-mSceneRoot = new KdTreeSceneNode(this, "root node");
-mSceneRoot->_notifyRootNode();
-
-mHierarchyInterface = new KdTreeHierarchyInterface(this, mDestRenderSystem);
+        // Replace root node with my node
+        OGRE_DELETE(mSceneRoot);
+        mSceneRoot = new KdTreeSceneNode(this, "root node");
+        mSceneRoot->_notifyRootNode();
+
+        // init heirarchy interface
+        mHierarchyInterface = new KdTreeHierarchyInterface(this, mDestRenderSystem);
 }
 
@@ -80 +80 @@
         return mShowBoxes;
 }
-
-//void KdTreeSceneManager::setEnhancedVis(bool enhanced)
-//{
-//      for (CameraList::iterator it = mCameras.begin(); it != mCameras.end(); it ++)
-//      {
-//              KDCAMPTR_CAST(it->second)->setEnhancedVisMode(enhanced);
-//      }
-//}
 
 bool KdTreeSceneManager::setOption(const String& strKey, const void* pValue)
@@ -156 +148 @@
         else if (strKey == "BuildMethod")
         {
-                String bm = *static_cast<const String *>(pValue);
-                if (bm == "PriorityQueue")
-                {
-                        mBuildMethod = KdTree::KDBM_PRIORITYQUEUE;
+                KdTree::BuildMethod bm = *static_cast<const KdTree::BuildMethod *>(pValue);
+                if (bm == KdTree::KDBM_RECURSIVE || bm == KdTree::KDBM_PRIORITYQUEUE)
+                {
+                        mBuildMethod = bm;
                         return true;
                 }
-                else if (bm == "Recursive")
-                {
-                        mBuildMethod = KdTree::KDBM_RECURSIVE;
+                else
+                {
+                        return false;
+                }
+        }
+        else if (strKey == "RenderMethod")
+        {
+                KdTree::RenderMethod rm = *static_cast<const KdTree::RenderMethod *>(pValue);
+                if (rm == KdTree::KDRM_INTERNAL)
+                {
+                        mRenderMethod = rm;
                         return true;
                 }
-                else
-                {
-                        return false;
-                }
-        }
-        else if (strKey == "RenderMethod")
-        {
-                String rm = *static_cast<const String *>(pValue);
-                if (rm == "INT")
-                {
-                        mRenderMethod = KdTree::KDRM_INTERNAL;
-                        return true;
-                }
-                else if (rm == "VFC")
-                {
-                        mRenderMethod = KdTree::KDRM_GTP_VFC;
+                else if (rm == KdTree::KDRM_GTP_VFC)
+                {
+                        mRenderMethod = rm;
                         int cmt = GtpVisibility::VisibilityEnvironment::FRUSTUM_CULLING;
                         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface)
                                 .setOption("Algorithm", &cmt);
                 }
-                else if (rm == "SWC")
-                {
-                        mRenderMethod = KdTree::KDRM_GTP_SWC;
+                else if (rm == KdTree::KDRM_GTP_SWC)
+                {
+                        mRenderMethod = rm;
                         int cmt = GtpVisibility::VisibilityEnvironment::STOP_AND_WAIT_CULLING;
                         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface)
                                 .setOption("Algorithm", &cmt);
                 }
-                else if (rm == "CHC")
-                {
-                        mRenderMethod = KdTree::KDRM_GTP_CHC;
+                else if (rm == KdTree::KDRM_GTP_CHC)
+                {
+                        mRenderMethod = rm;
                         int cmt = GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING;
                         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface)
@@ -205 +192 @@
                         return false;
                 }
+                //String rm = *static_cast<const String *>(pValue);
+                //if (rm == "INT")
+                //{
+                //      mRenderMethod = KdTree::KDRM_INTERNAL;
+                //      return true;
+                //}
+                //else if (rm == "VFC")
+                //{
+                //      mRenderMethod = KdTree::KDRM_GTP_VFC;
+                //      int cmt = GtpVisibility::VisibilityEnvironment::FRUSTUM_CULLING;
+                //      return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface)
+                //              .setOption("Algorithm", &cmt);
+                //}
+                //else if (rm == "SWC")
+                //{
+                //      mRenderMethod = KdTree::KDRM_GTP_SWC;
+                //      int cmt = GtpVisibility::VisibilityEnvironment::STOP_AND_WAIT_CULLING;
+                //      return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface)
+                //              .setOption("Algorithm", &cmt);
+                //}
+                //else if (rm == "CHC")
+                //{
+                //      mRenderMethod = KdTree::KDRM_GTP_CHC;
+                //      int cmt = GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING;
+                //      return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface)
+                //              .setOption("Algorithm", &cmt);
+                //}
+                //else
+                //{
+                //      return false;
+                //}
         }
         // little hack in case someone uses "Algorithm" option from VisOptMan directly
@@ -362 +380 @@
                 if (mKdTree)
                         *static_cast<bool *>(pDestValue) = mKdTree->getEnhancedVis();
-                        //KDCAMPTR_CAST(mCameras.begin()->second)->getEnhancedVisMode();
                 else
                         *static_cast<bool *>(pDestValue) = mEnhancedVisiblity;
@@ -369 +386 @@
         else if (strKey == "BuildMethod")
         {
-                if (mBuildMethod == KdTree::KDBM_PRIORITYQUEUE)
-                {
-                        *static_cast<String *>(pDestValue) = "PriorityQueue";
-                }
-                else if (mBuildMethod == KdTree::KDBM_RECURSIVE)
-                {
-                        *static_cast<String *>(pDestValue) = "Recursive";
-                }
+                //if (mBuildMethod == KdTree::KDBM_PRIORITYQUEUE)
+                //{
+                //      *static_cast<String *>(pDestValue) = "PriorityQueue";
+                //}
+                //else if (mBuildMethod == KdTree::KDBM_RECURSIVE)
+                //{
+                //      *static_cast<String *>(pDestValue) = "Recursive";
+                //}
+                *static_cast<KdTree::BuildMethod *>(pDestValue) = mBuildMethod;
                 return true;
         }
         else if (strKey == "RenderMethod")
         {
-                if (mRenderMethod == KdTree::KDRM_INTERNAL)
-                {
-                        *static_cast<String *>(pDestValue) = "INT";
-                }
-                else if (mRenderMethod == KdTree::KDRM_GTP_VFC)
-                {
-                                *static_cast<String *>(pDestValue) = "VFC";
-                }
-                else if (mRenderMethod == KdTree::KDRM_GTP_SWC)
-                {
-                                *static_cast<String *>(pDestValue) = "SWC";
-                }
-                else if (mRenderMethod == KdTree::KDRM_GTP_CHC)
-                {
-                                *static_cast<String *>(pDestValue) = "CHC";
-                }
-                else
-                {
-                        return false;
-                }
+                //if (mRenderMethod == KdTree::KDRM_INTERNAL)
+                //{
+                //      *static_cast<String *>(pDestValue) = "INT";
+                //}
+                //else if (mRenderMethod == KdTree::KDRM_GTP_VFC)
+                //{
+                //              *static_cast<String *>(pDestValue) = "VFC";
+                //}
+                //else if (mRenderMethod == KdTree::KDRM_GTP_SWC)
+                //{
+                //              *static_cast<String *>(pDestValue) = "SWC";
+                //}
+                //else if (mRenderMethod == KdTree::KDRM_GTP_CHC)
+                //{
+                //              *static_cast<String *>(pDestValue) = "CHC";
+                //}
+                //else
+                //{
+                //      return false;
+                //}
+                *static_cast<KdTree::RenderMethod *>(pDestValue) = mRenderMethod;
                 return true;
         }