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

Timestamp:

07/31/06 17:34:56 (18 years ago)

Author:

szydlowski

Message:

Finished kdtree hierarchy interface, started modifications to kdtree scene manager

Location:

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

Files:

• OgreKdRenderable.h (modified) (2 diffs)
• OgreKdTree.h (modified) (6 diffs)
• OgreKdTreeSceneManager.h (modified) (2 diffs)
• OgreKdTreeSceneNode.h (modified) (1 diff)

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

@@ -12 +12 @@
 
 #include "OgreKdTree.h"
+#include "HierarchyInterface.h"
 
 namespace Ogre
@@ -33 +34 @@
                 // put all objects this element holds in the renedering queue
                 virtual void queueObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters) = 0;
+
+                // place all entities in geometry queue (for CHC)
+                virtual void getGeometryList(GtpVisibility::GeometryVector *geometryList) = 0;
 
                 // return a bounding box enclosing all objects

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

@@ -27 +27 @@
 #include <stack>
 
-//#include "OgreKdTreeHierarchyInterface.h"
 
 
@@ -264 +263 @@
                         */
                         bool isNodeVisible(void) { return mVisible; };
-                        /** Gets this node's parent (NULL if this is the root).
-                        */      
-                        KdTree::Node *getParent(void) { return mParent; };
                         /** Frame id when this octree was last rendered. 
                         @return last rendered frame id
@@ -275 +271 @@
                         */
                         void setLastRendered(unsigned int frameid) { mLastRendered = frameid; };
-
-                        /* do we need this? */
-                        /** Returns real extent of the octree, i.e., the merged extent of the bounding boxes. 
+                        /** Gets this node's parent (NULL if this is the root).
+                        */      
+                        KdTree::Branch *getParent(void) { return mParent; };
+                        /** Returns real extent of the kdtree, i.e., the merged extent of the bounding boxes. 
                         */
-                        //AxisAlignedBox _getWorldAABB(void) const = 0;
+                        AxisAlignedBox _getWorldAABB(void) const { return mWorldAABB; };
+                        /** Updates bound of the real aabb of kdtree
+                        */
+                        virtual void _updateBounds() = 0;
 
 
@@ -290 +290 @@
                         // for the CHC hierarchy interface
                         /** the real extent of the node. */
-                        //AxisAlignedBox mWorldAABB;
-
+                        AxisAlignedBox mWorldAABB;
+                        
                         unsigned int mLastRendered;
                         unsigned int mLastVisited;
@@ -323 +323 @@
                         // a branch never has geometry
                         virtual bool hasGeometry() const { return false; };
+
+                        // branches do not posses geometry => just merge child aabbs
+                        virtual void _updateBounds()
+                        {
+                                // reset box
+                                mWorldAABB.setNull();
+
+                                if (mLeft)
+                                        mWorldAABB.merge(mLeft->_getWorldAABB());
+                                if (mRight)
+                                        mWorldAABB.merge(mRight->_getWorldAABB());
+
+                                // update parent recursively
+                                if (mParent)
+                                        mParent->_updateBounds();
+                        }
                         
                         Node * mLeft;
@@ -347 +363 @@
                         // a leaf has geometry when it has renderables
                         virtual bool hasGeometry() const { return !mKdRenderables.empty(); };
+
+                        // update the world aabb based on the contained geometry
+                        virtual void _updateBounds();
 
                         virtual void remove(KdRenderable * rend)

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

@@ -28 +28 @@
         public:
                 KdTreeSceneManager(const String& name, GtpVisibility::VisibilityManager *vm);
-                //KdTreeSceneManager(const String& name, int maxdepth);
                 ~KdTreeSceneManager(void);
 
@@ -34 +33 @@
                 virtual SceneNode* createSceneNode(void);
                 virtual SceneNode* createSceneNode(const String& name);
-                void init( int maxdepth );
-                void walkTree(KdTree * node, Camera *cam);
 
                 virtual void _findVisibleObjects(Camera *cam, bool onlyShadowCasters);
+
+                virtual void _renderNodes(const KdRenderableList& nodelist, Camera * cam,
+                        bool onlyShadowCasters, int leavePassesInQueue);
 
                 virtual void setShowBoxes(bool showboxes);

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

@@ -37 +37 @@
                 virtual void queueObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters);
 
+                // place all entities in geometry queue (for CHC)
+                virtual void getGeometryList(GtpVisibility::GeometryVector *geometryList);
+
                 // return a bounding box enclosing all objects
                 virtual AxisAlignedBox getBoundingBox() const;