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

Timestamp:

08/17/06 18:04:15 (18 years ago)

Author:

szydlowski

Message:

enhanced visibility (none/full/partial) implemented for internal culling

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

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

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

@@ -29 +29 @@
 #include <stack>
 
+#include "OgreKdTreeCamera.h"
 #include "HierarchyInterface.h"
 
@@ -510 +511 @@
                 inline bool getShowNodes(void) { return mShowNodes; };
 
+                // changes vis mode (simple/enhanced with NONE/PART/FULL vis)
+                void setEnhancedVis(bool enh);
+                bool getEnhancedVis(void);
+
                 NodePtr getRoot(void) const { return mKdRoot; };
 
@@ -585 +590 @@
                 bool mShowNodes;
 
+                // pointer zur getVisibility function (simple oder enhanced)
+                KdTreeCamera::NodeVisibility (KdTreeCamera::*getVisibility)(const AxisAlignedBox& box) const;
 
                 // DEBUG

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

@@ -179 +179 @@
         /** Switches between simple & enhanced visibility
         */
-        void setEnhancedVis(bool enhanced);
+        //void setEnhancedVis(bool enhanced);
 
 

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

@@ -12 +12 @@
 #include "OgreKdTreeSceneNode.h"
 #include "OgreKdTreeSceneManager.h"
-#include "OgreKdTreeCamera.h"
 
 #include <OgreStringConverter.h>
@@ -371 +370 @@
                         mBuildLog = LogManager::getSingleton().createLog(KDTREE_LOGNAME);
                 }
+
+                setEnhancedVis(false);
         }
 
@@ -1201 +1202 @@
                 //if (cam->isVisible(node->mAABB))
                 if (fullVis || 
-                        ((vis = cam->getVisibilityEnhanced(node->mAABB)) != KdTreeCamera::KDNV_NONE))
+                        ((vis = (cam->*getVisibility)(node->mAABB)) != KdTreeCamera::KDNV_NONE))
                         //((vis = (cam->*getVisibility)(node->mAABB)) != KdTreeCamera::KDNV_NONE))
                 {
@@ -1219 +1220 @@
         }
 
-        ////-------------------------------------------------------------------------
+        //-------------------------------------------------------------------------
+        void KdTree::setEnhancedVis(bool enh)
+        {
+                if (enh)
+                        getVisibility = &KdTreeCamera::getVisibilityEnhanced;
+                else
+                        getVisibility = &KdTreeCamera::getVisibilitySimple;
+        }
+
+        //-------------------------------------------------------------------------
+        bool KdTree::getEnhancedVis()
+        {
+                return getVisibility == &KdTreeCamera::getVisibilityEnhanced;
+        }
+
+        //-------------------------------------------------------------------------
         //void KdTree::findVisibleNodes(NodeList& visibleNodes, Camera * cam)
         //{

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

@@ -80 +80 @@
 }
 
-void KdTreeSceneManager::setEnhancedVis(bool enhanced)
-{
-        for (CameraList::iterator it = mCameras.begin(); it != mCameras.end(); it ++)
-        {
-                KDCAMPTR_CAST(it->second)->setEnhancedVisMode(enhanced);
-        }
-}
+//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)
@@ -146 +146 @@
         {
                 bool enh = *static_cast<const bool *>(pValue);
-                setEnhancedVis(enh);
+                if (mKdTree)
+                        mKdTree->setEnhancedVis(enh);
+                //setEnhancedVis(enh);
                 return true;
         }
@@ -355 +357 @@
         else if (strKey == "EnhancedVisibility")
         {
-                *static_cast<bool *>(pDestValue) = 
-                        KDCAMPTR_CAST(mCameras.begin()->second)->getEnhancedVisMode();
+                if (mKdTree)
+                        *static_cast<bool *>(pDestValue) = mKdTree->getEnhancedVis();
+                        //KDCAMPTR_CAST(mCameras.begin()->second)->getEnhancedVisMode();
+                else
+                        *static_cast<bool *>(pDestValue) = true;
+                return true;
         }
         else if (strKey == "BuildMethod")