Changeset 1206

Timestamp:

08/17/06 13:56:10 (18 years ago)

Author:

szydlowski

Message:

enhanced visibility partially implemented

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreKdTree.h (modified) (3 diffs)
• include/OgreKdTreeSceneManager.h (modified) (3 diffs)
• scripts/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• src/OgreKdTree.cpp (modified) (4 diffs)
• src/OgreKdTreeSceneManager.cpp (modified) (6 diffs)

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

@@ -34 +34 @@
 namespace Ogre
 {
+        class KdTreeCamera;
         class KdRenderable;
         struct SplitInfo;
@@ -519 +520 @@
 
                 // test visibility of objects and add to render queue
-                void queueVisibleObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters, 
+                void queueVisibleObjects(KdTreeCamera* cam, RenderQueue* queue, bool onlyShadowCasters, 
                         bool showBoxes, KdTree::NodeList& visibleNodes);
 
@@ -555 +556 @@
 
                 // recursive rendering function
-                void recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, Camera* cam,
-                        RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, KdTree::NodeList& visibleNodes);
+                void recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, KdTreeCamera* cam,
+                        RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, 
+                        KdTree::NodeList& visibleNodes, bool fullVis = false);
 
                 // recursively find visible nodes

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

@@ -15 +15 @@
 #include <VisibilityManager.h>
 #include "OgreKdTree.h"
+#include "OgreKdTreeCamera.h"
 
 #define KDTREE_MAX_DEPTH 12
@@ -38 +39 @@
         /************************************************************************/
 
+        /** Override from Scenemanager to create Camera as instance of KdTreeCamera
+        */
+        virtual Camera* createCamera(const String& name);
+
         /** Override from SceneManager to create SceneNodes as instance of KdTreeSceneNode
         */
@@ -171 +176 @@
         */
         void WriteLog();
+
+        /** Switches between simple & enhanced visibility
+        */
+        void setEnhancedVis(bool enhanced);
 
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -273 +273 @@
                                 </File>
                                 <File
+                                        RelativePath="..\include\OgreKdTreeCamera.h">
+                                </File>
+                                <File
                                         RelativePath="..\include\OgreKdTreeHierarchyInterface.h">
                                 </File>
@@ -287 +290 @@
                                 <File
                                         RelativePath="..\src\OgreKdTree.cpp">
+                                </File>
+                                <File
+                                        RelativePath="..\src\OgreKdTreeCamera.cpp">
                                 </File>
                                 <File

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

@@ -8 +8 @@
 */
 
-#include <OgreCamera.h>
 #include "OgreKdTree.h"
 #include "OgreKdRenderable.h"
 #include "OgreKdTreeSceneNode.h"
 #include "OgreKdTreeSceneManager.h"
+#include "OgreKdTreeCamera.h"
 
 #include <OgreStringConverter.h>
@@ -1184 +1184 @@
 
         //-------------------------------------------------------------------------
-        void KdTree::queueVisibleObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters, 
+        void KdTree::queueVisibleObjects(KdTreeCamera* cam, RenderQueue* queue, bool onlyShadowCasters, 
                 bool showBoxes, KdTree::NodeList& visibleNodes)
         {
@@ -1194 +1194 @@
         //-------------------------------------------------------------------------
         void KdTree::recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, 
-                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, KdTree::NodeList& visibleNodes)
-        {
+                KdTreeCamera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, 
+                KdTree::NodeList& visibleNodes, bool fullVis)
+        {
+                KdTreeCamera::NodeVisibility vis = KdTreeCamera::KDNV_PART;
                 // test visibility
-                if (cam->isVisible(node->mAABB))
+                //if (cam->isVisible(node->mAABB))
+                if (fullVis || 
+                        ((vis = cam->getVisibilityEnhanced(node->mAABB)) != KdTreeCamera::KDNV_NONE))
+                        //((vis = (cam->*getVisibility)(node->mAABB)) != KdTreeCamera::KDNV_NONE))
                 {
                         visibleNodes.push_back(node);
@@ -1205 +1210 @@
                         if (node->getLeftChild())
                                 recQueueVisibleObjects(node->getLeftChild(), currentFrame, 
-                                cam, queue, onlyShadowCasters, showBoxes, visibleNodes);
+                                cam, queue, onlyShadowCasters, showBoxes, visibleNodes, 
+                                (fullVis || vis == KdTreeCamera::KDNV_FULL) ? true : false);
                         if (node->getRightChild())
                                 recQueueVisibleObjects(node->getRightChild(), currentFrame, 
-                                cam, queue, onlyShadowCasters, showBoxes, visibleNodes);
+                                cam, queue, onlyShadowCasters, showBoxes, visibleNodes, 
+                                (fullVis || vis == KdTreeCamera::KDNV_FULL) ? true : false);
                 }
         }

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);
+        }
+}
+
 bool KdTreeSceneManager::setOption(const String& strKey, const void* pValue)
 {
@@ -133 +141 @@
                 mKdTree = new KdTree(mMaxDepth, mBuildMethod, mHiLiteLevel, mShowAllBoxes, mShowNodes);
                 mKdTree->build(static_cast<KdTreeSceneNode *>(mSceneRoot));
+                return true;
+        }
+        else if (strKey == "EnhancedVisibility")
+        {
+                bool enh = *static_cast<const bool *>(pValue);
+                setEnhancedVis(enh);
                 return true;
         }
@@ -338 +352 @@
                 *static_cast<Real *>(pDestValue) = PlaneEvent::KI;
                 return true;
+        }
+        else if (strKey == "EnhancedVisibility")
+        {
+                *static_cast<bool *>(pDestValue) = 
+                        KDCAMPTR_CAST(mCameras.begin()->second)->getEnhancedVisMode();
         }
         else if (strKey == "BuildMethod")
@@ -441 +460 @@
 }
 
+Camera* KdTreeSceneManager::createCamera(const String& name)
+{
+        // Check name not used
+        if (mCameras.find(name) != mCameras.end())
+        {
+                OGRE_EXCEPT(
+                        Exception::ERR_DUPLICATE_ITEM,
+                        "A camera with the name " + name + " already exists",
+                        "SceneManager::createCamera" );
+        }
+
+        Camera *c = new KdTreeCamera(name, this);
+        mCameras.insert(CameraList::value_type(name, c));
+
+        return c;
+}
+
 SceneNode* KdTreeSceneManager::createSceneNode(void)
 {
@@ -543 +579 @@
                         mVisibleNodes.clear();
                         if (mKdTree)
-                                mKdTree->queueVisibleObjects(cam, getRenderQueue(), onlyShadowCasters, mShowBoxes, mVisibleNodes);
+                                mKdTree->queueVisibleObjects(KDCAMPTR_CAST(cam), getRenderQueue(), onlyShadowCasters, mShowBoxes, mVisibleNodes);
                 }
         }
@@ -565 +601 @@
                                 getRenderQueue()->clear();
                                 if (mKdTree)
-                                        mKdTree->queueVisibleObjects(cam, getRenderQueue(), onlyShadowCasters, mShowBoxes, mVisibleNodes);
+                                        mKdTree->queueVisibleObjects(KDCAMPTR_CAST(cam), getRenderQueue(), onlyShadowCasters, mShowBoxes, mVisibleNodes);
                         }