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

Timestamp:

08/08/06 18:25:06 (18 years ago)

Author:

szydlowski

Message:

visualization in test app working, some issues to resolve

Location:

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

Files:

• OgreKdTree.h (modified) (7 diffs)
• OgreKdTreeSceneManager.h (modified) (3 diffs)
• OgreKdTreeSceneNode.h (modified) (1 diff)

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

@@ -207 +207 @@
                         virtual bool isEmpty() const = 0;
                         virtual bool hasGeometry() const = 0;
+
+                        virtual void queueVisibleObjects(unsigned long currentFrame, 
+                                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes) = 0;
                         
                         // consider using typesafe callback functions
@@ -288 +291 @@
                         int mLevel;
                         AxisAlignedBox mAABB;
-                protected:
-                        WireBoundingBox * mWBB;
 
                         // for the CHC hierarchy interface
                         /** the real extent of the node. */
                         AxisAlignedBox mWorldAABB;
+                protected:
+                        WireBoundingBox * mWBB;
                         
                         unsigned int mLastRendered;
@@ -327 +330 @@
                         virtual bool hasGeometry() const { return false; };
 
+                        virtual void queueVisibleObjects(unsigned long currentFrame, 
+                                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes)
+                        {
+                                if (showBoxes)
+                                {
+                                        WireBoundingBox * wbb = getWireBoundingBox();
+                                        if (wbb)
+                                                queue->addRenderable(wbb);
+                                }
+                        }
+
                         // branches do not posses geometry => just merge child aabbs
                         virtual void _updateBounds(bool recurse = true)
@@ -334 +348 @@
 
                                 if (mLeft)
-                                        mWorldAABB.merge(mLeft->_getWorldAABB());
+                                        mWorldAABB.merge(mLeft->mWorldAABB);
                                 if (mRight)
-                                        mWorldAABB.merge(mRight->_getWorldAABB());
+                                        mWorldAABB.merge(mRight->mWorldAABB);
 
                                 // update parent recursively
@@ -367 +381 @@
                         virtual bool hasGeometry() const { return !mKdRenderables.empty(); };
 
+                        virtual void queueVisibleObjects(unsigned long currentFrame, 
+                                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes);
+
                         // update the world aabb based on the contained geometry
                         virtual void _updateBounds(bool recurse = true);
@@ -430 +447 @@
                 typedef KdTree::Branch * BranchPtr;
                 typedef KdTree::Leaf * LeafPtr;
+
+                typedef std::list<NodePtr> NodeList;
                 typedef std::set<LeafPtr> LeafSet;
 
@@ -484 +503 @@
 
                 // test visibility of objects and add to render queue
-                void queueVisibleObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters, 
-                        RenderMethod renderMethod, bool showBoxes = false);
+                void queueVisibleObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes = false);
 
                 // self-explanatory ...

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

@@ -16 +16 @@
 #include "OgreKdTree.h"
 
-#define KDTREE_MAX_DEPTH 20
+#define KDTREE_MAX_DEPTH 12
 
 namespace Ogre
@@ -134 +134 @@
         /** Render a list of scenenodes
         */
-        virtual void _renderNodes(const KdRenderableList& nodelist, Camera * cam,
+        //virtual void _renderNodes(const KdRenderableList& nodelist, Camera * cam,
+        //      bool onlyShadowCasters, int leavePassesInQueue);
+        virtual void _renderNode(KdTree::NodePtr node, Camera * cam,
                 bool onlyShadowCasters, int leavePassesInQueue);
 
@@ -227 +229 @@
 
         // remember visited scene nodes for viz
-        KdRenderableList mVisibleNodes;
+        //KdRenderableList mVisibleNodes;
+        KdTree::NodeList mVisibleNodes;
 
         /************************************************************************/

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

@@ -43 +43 @@
                 virtual AxisAlignedBox getBoundingBox() const;
 
+                // custom render op, show bounding box instead of axes
+                //virtual void getRenderOperation(RenderOperation& op);
+
                 //virtual void _findVisibleObjects(Camera* cam, RenderQueue* queue, 
                 //      bool includeChildren = true, bool displayNodes = false, bool onlyShadowCasters = false);