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

Timestamp:

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

Author:

szydlowski

Message:

visualization workin' fine (TM)
demo recording/playback partially implemented

Location:

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

Files:

• OgreKdRenderable.h (modified) (1 diff)
• OgreKdTree.h (modified) (11 diffs)

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

@@ -12 +12 @@
 
 #include "OgreKdTree.h"
-#include "HierarchyInterface.h"
 
 namespace Ogre

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

@@ -27 +27 @@
 #include <stack>
 
+#include "HierarchyInterface.h"
 
 
@@ -210 +211 @@
 
                         // Gets this node's parent (NULL if this is the root).
-                        Node *getParent(void) const { return mParent; };
-                        // Gets the nodes left & right child nodes, or NULL if not present
-                        // or node is leaf
-                        virtual Node *getLeftChild(void) const = 0;
-                        virtual Node *getRightChild(void) const = 0;
-                        
-                        // returns the level the node is on
-                        int getLevel(void) const { return mLevel; };
-
+                        KdTree::Node *getParent(void) const { return mParent; };
+
+                        // Gets the nodes left & right child nodes, or NULL if not present or node is leaf
+                        virtual KdTree::Node *getLeftChild(void) const = 0;
+                        virtual KdTree::Node *getRightChild(void) const = 0;
+
+                        // add contained objects to render queue
                         virtual void queueVisibleObjects(unsigned long currentFrame, 
                                 Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes) = 0;
+
+                        // add contained geometry (Entities) to list
+                        virtual void getGeometryList(GtpVisibility::GeometryVector *geometryList) = 0;
                         
+                        // create (when necessary), setup and return wire bounding box representing the node
                         WireBoundingBox * getWireBoundingBox()
                         {
@@ -238 +241 @@
                                 
                                 return mWBB;
-
                         }
+
+                        // returns the level the node is on
+                        int getLevel(void) const { return mLevel; };
 
                         // functions for the CHC hierarchy interface
@@ -270 +275 @@
                         */
                         virtual void _updateBounds(bool recurse = true) = 0;
-
+                        
+                        /** bounding box of the node**/
                         AxisAlignedBox mAABB;
 
-                        // for the CHC hierarchy interface
-                        /** the real extent of the node. */
+                        /** mounding box of all objects inside the node */
                         AxisAlignedBox mWorldAABB;
                 protected:
@@ -283 +288 @@
                         WireBoundingBox * mWBB;
                         
+                        // for the CHC hierarchy interface
                         unsigned int mLastRendered;
                         unsigned int mLastVisited;
@@ -317 +323 @@
 
                         // a branch should have at least one child
-                        virtual Node * getLeftChild() const { return mLeft; };
-                        virtual Node * getRightChild() const { return mRight; };
+                        virtual KdTree::Node * getLeftChild() const { return mLeft; };
+                        virtual KdTree::Node * getRightChild() const { return mRight; };
 
                         virtual void queueVisibleObjects(unsigned long currentFrame, 
@@ -327 +333 @@
                                                 queue->addRenderable(getWireBoundingBox());
                         }
+
+                        // a branch has no geometry, do nothing
+                        virtual void getGeometryList(GtpVisibility::GeometryVector *geometryList) { }
 
                         // branches do not posses geometry => just merge child aabbs
@@ -369 +378 @@
 
                         // a leaf never has children 
-                        virtual Node * getLeftChild() const { return 0; };
-                        virtual Node * getRightChild() const { return 0; };
+                        virtual KdTree::Node * getLeftChild() const { return 0; };
+                        virtual KdTree::Node * getRightChild() const { return 0; };
 
                         virtual void queueVisibleObjects(unsigned long currentFrame, 
                                 Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes);
 
+                        virtual void getGeometryList(GtpVisibility::GeometryVector *geometryList);
+
                         // update the world aabb based on the contained geometry
                         virtual void _updateBounds(bool recurse = true);
@@ -394 +405 @@
                 struct SplitCandidate
                 {
-                        SplitCandidate(PlaneEventList * e, int n, AxisAlignedBox& a, KdTree::Branch * p, Real c, Real d, SplitInfo * b, PlaneEvent::Side s):
-                                events(e), nObjects(n), aabb(a), parent(p), cost(c), decrease(d), best(b), side(s) { };
+                        SplitCandidate(PlaneEventList * e, int n, AxisAlignedBox& a,
+                                KdTree::Branch * p, Real c, Real d, SplitInfo * b, PlaneEvent::Side s):
+                        events(e), nObjects(n), aabb(a), parent(p), cost(c), decrease(d), best(b), side(s)
+                        { };
 
                         bool operator < (const SplitCandidate& rhs) const
@@ -504 +517 @@
 
                 // test visibility of objects and add to render queue
-                void queueVisibleObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes = false);
+                void queueVisibleObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters, 
+                        bool showBoxes, KdTree::NodeList& visibleNodes);
+
+                // find visible nodes & place in list
+                //void findVisibleNodes(NodeList& visibleNodes, Camera * cam);
 
                 // self-explanatory ...
@@ -536 +553 @@
 
                 // recursive rendering function
-                void recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, 
-                        Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes);
+                void recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, Camera* cam,
+                        RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, KdTree::NodeList& visibleNodes);
+
+                // recursively find visible nodes
+                //void recFindVisibleNodes(KdTree::Node * node, NodeList& visibleNodes, Camera * cam);
 
                 // the root node of the kdtree