Changeset 1296 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include

Timestamp:

08/29/06 18:28:00 (18 years ago)

Author:

szydlowski

Message:

Implemented PVS support in kdtree scene manager - not complete, defunct
modified BoundingBoxConverter? to work with KdTreeSceneManager?

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include

Files:

• OgreBoundingBoxConverter.h (modified) (3 diffs)
• OgreKdTree.h (modified) (2 diffs)
• OgreKdTreeSceneManager.h (modified) (5 diffs)

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

@@ -12 +12 @@
 class Entity;
 class OctreeSceneManager;
+class KdTreeSceneManager;
 
 /**     Class which converts preprocessor types to OGRE types
@@ -19 +20 @@
 public:
         OgreBoundingBoxConverter(OctreeSceneManager *sm);
+        OgreBoundingBoxConverter(KdTreeSceneManager *sm);
 
         bool IdentifyObjects(const GtpVisibilityPreprocessor::IndexedBoundingBoxContainer &iboxes,
@@ -28 +30 @@
         Entity *FindCorrespondingObject(const AxisAlignedBox &box) const;
 
-        OctreeSceneManager *mSceneMgr;
+        OctreeSceneManager *mOctSceneMgr;
+        KdTreeSceneManager *mKdSceneMgr;
 };
 

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

@@ -561 +561 @@
                 //void findVisibleNodes(NodeList& visibleNodes, Camera * cam);
 
+                /** Recurses the kdtree, adding any nodes intersecting with the 
+                box/sphere/volume/ray into the given list.
+                It ignores the exclude scene node.
+                */
+                void findNodesIn(const AxisAlignedBox &box, std::list<SceneNode *> &list, SceneNode *exclude = 0);
+                void findNodesIn(const Sphere &sphere, std::list<SceneNode *> &list, SceneNode *exclude = 0);
+                void findNodesIn(const PlaneBoundedVolume &volume, std::list<SceneNode *> &list, SceneNode *exclude = 0);
+                void findNodesIn(const Ray &ray, std::list<SceneNode *> &list, SceneNode *exclude = 0);
+
                 // self-explanatory ...
                 int getMaxDepth(void) { return mMaxDepth; };
-                Stats getStats(void) const { return mStats; };
+                const Stats& getStats(void) const { return mStats; };
                 AxisAlignedBox getBox(void) { if (mKdRoot) return mKdRoot->mAABB; else return AxisAlignedBox(); };
                 void setBuildMethod(BuildMethod bm) { mBuildMethod = bm; }
@@ -598 +607 @@
                 //void recFindVisibleNodes(KdTree::Node * node, NodeList& visibleNodes, Camera * cam);
 
+                /** Recurses the kdtree, adding any nodes intersecting with the 
+                box/sphere/volume/ray into the given list.
+                It ignores the exclude scene node.
+                */
+                void recFindNodesIn(const AxisAlignedBox &box, std::list<SceneNode *> &list, SceneNode *exclude, Node * node, bool full = false);
+                void recFindNodesIn(const Sphere &sphere, std::list<SceneNode *> &list, SceneNode *exclude, Node * node, bool full = false);
+                void recFindNodesIn(const PlaneBoundedVolume &volume, std::list<SceneNode *> &list, SceneNode *exclude, Node * node, bool full = false);
+                void recFindNodesIn(const Ray &ray, std::list<SceneNode *> &list, SceneNode *exclude, Node * node, bool full = false);
+
                 // the root node of the kdtree
                 KdTree::Node * mKdRoot;

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

@@ -13 +13 @@
 #include <OgreSceneManager.h>
 #include <VisibilityManager.h>
+#include <ViewCellsManager.h>
 
 #include "OgreKdTree.h"
@@ -123 +124 @@
         virtual bool getShowBoxes(void) const;
 
+        /** Recurses the kdtree, adding any nodes intersecting with the 
+        box/sphere/volume/ray into the given list.
+        It ignores the exclude scene node.
+        */
+        void findNodesIn( const AxisAlignedBox &box, std::list < SceneNode * > &list, SceneNode *exclude = 0 )
+        {
+                if (mKdTree)
+                        mKdTree->findNodesIn(box, list, exclude);
+        }
+        void findNodesIn( const Sphere &sphere, std::list < SceneNode * > &list, SceneNode *exclude = 0 )
+        {
+                if (mKdTree)
+                        mKdTree->findNodesIn(sphere, list, exclude);
+        }
+        void findNodesIn( const PlaneBoundedVolume &volume, std::list < SceneNode * > &list, SceneNode *exclude=0 )
+        {
+                if (mKdTree)
+                        mKdTree->findNodesIn(volume, list, exclude);
+        }
+        void findNodesIn( const Ray &ray, std::list < SceneNode * > &list, SceneNode *exclude=0 )
+        {
+                if (mKdTree)
+                        mKdTree->findNodesIn(ray, list, exclude);
+        }
+
+        /************************************************************************/
+        /* Functions for PVS                                                    */
+        /************************************************************************/
+        /** Loads view cells for this particular scene.
+        */
+        bool LoadViewCells(const String &filename);
+
         /************************************************************************/
         /* Functions for CHC                                                    */
@@ -168 +201 @@
         void WriteLog();
 
-        /** Switches between simple & enhanced visibility
-        */
-        //void setEnhancedVis(bool enhanced);
-
+        /************************************************************************/
+        /* Functions for PVS                                                    */
+        /************************************************************************/
+        /** Loads / unloads pvs of the view cell to set the visibility in the scene.
+        */
+        void applyViewCellPvs(GtpVisibilityPreprocessor::ViewCell *vc, const bool load);
+
+        /** updates pvs in current frame.
+        */
+        void updatePvs(Camera *cam);
+
+        /** Sets all objects invisible.
+        */
+        void SetObjectsVisible(const bool visible);
 
         /************************************************************************/
@@ -225 +268 @@
         // if we currently render the item buffer 
         bool mIsItemBufferPhase;
+        // delete or clear the renderqueue after each rame?
+        bool mDeleteQueueAfterRendering;
+
 
         // remember visited scene nodes for viz
-        //KdRenderableList mVisibleNodes;
         KdTree::NodeList mVisibleNodes;
-
-        bool mDeleteQueueAfterRendering;
 
         /************************************************************************/
@@ -258 +301 @@
         // the method of building the tree
         KdTree::BuildMethod mBuildMethod;
+
+        /************************************************************************/
+        /* PVS specific options and members                                     */
+        /************************************************************************/
+
+        // The view cell manager
+        GtpVisibilityPreprocessor::ViewCellsManager *mViewCellsManager;
+
+        /// Used to assign Ogre meshes to view cell entries.
+        GtpVisibilityPreprocessor::ObjectContainer mObjects;
+
+        GtpVisibilityPreprocessor::ViewCell *mElementaryViewCell;
+        GtpVisibilityPreprocessor::ViewCell *mCurrentViewCell;
+
+        /// If view cells are loaded.
+        bool mViewCellsLoaded;
+
+        /// If view cells are used.
+        bool mUseViewCells;
+
+        /// if the view cells are filtered
+        bool mUseVisibilityFilter;
 };