Changeset 1250 for GTP/trunk/Lib/Vis/OnlineCullingCHC

Timestamp:

08/21/06 17:05:45 (18 years ago)

Author:

szydlowski

Message:

implemented enhanced vis with early abort
also own frame & time counter in demo mode
fixed dependencies in solution file

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreKdTree.h (modified) (8 diffs)
• include/OgreKdTreeCamera.h (modified) (1 diff)
• src/OgreKdTree.cpp (modified) (3 diffs)
• src/OgreKdTreeCamera.cpp (modified) (3 diffs)

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

@@ -213 +213 @@
                         virtual bool isEmpty() const = 0;
                         virtual bool hasGeometry() const = 0;
+                        
+                        virtual void mergeLeaves(std::set<Leaf *>& leaves) = 0;
 
                         // Gets this node's parent (NULL if this is the root).
@@ -223 +225 @@
                         // add contained objects to render queue
                         virtual void queueVisibleObjects(unsigned long currentFrame, 
-                                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes) = 0;
+                                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, bool fullVis = false) = 0;
 
                         // add contained geometry (Entities) to list
@@ -326 +328 @@
                         virtual bool hasGeometry() const { return false; };
 
+                        virtual void mergeLeaves(std::set<Leaf *>& leaves)
+                        {
+                                for (std::set<Leaf *>::iterator it = mLeaves.begin(); it != mLeaves.end(); it++)
+                                        leaves.insert(*it);
+                        }
+
                         // a branch should have at least one child
                         virtual KdTree::Node * getLeftChild() const { return mLeft; };
@@ -331 +339 @@
 
                         virtual void queueVisibleObjects(unsigned long currentFrame, 
-                                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes)
+                                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, bool fullVis = false)
                         {
                                 if (showBoxes)
                                         if (mLevel == mOwner->getHiLiteLevel() || mOwner->getShowAllBoxes())
                                                 queue->addRenderable(getWireBoundingBox());
+
+                                if (fullVis)
+                                        for (std::set<Leaf *>::iterator it = mLeaves.begin(); it != mLeaves.end(); it ++)
+                                                (*it)->queueVisibleObjects(currentFrame, cam, queue, onlyShadowCasters, showBoxes, fullVis);
                         }
 
@@ -347 +359 @@
                                 mWorldAABB.setNull();
 
+                                // merge box & leaves
                                 if (mLeft)
+                                {
                                         mWorldAABB.merge(mLeft->mWorldAABB);
+                                        mLeft->mergeLeaves(mLeaves);
+                                }
                                 if (mRight)
+                                {
                                         mWorldAABB.merge(mRight->mWorldAABB);
+                                        mRight->mergeLeaves(mLeaves);
+                                }
 
                                 // update parent recursively
@@ -361 +380 @@
                         Plane  * mSplitPlane;
                         PlaneEvent::Side mPlaneSide;
+                protected:
+                        std::set<Leaf *> mLeaves;
                 };
 
@@ -373 +394 @@
 
                         // a leaf is a leaf, dammit
-                        virtual bool isLeaf() const { return true; };
+                        virtual bool isLeaf() const { return true; }
 
                         // a leaf is empty when it does not posses renderables
-                        virtual bool isEmpty() const { return mKdRenderables.empty(); };
+                        virtual bool isEmpty() const { return mKdRenderables.empty(); }
 
                         // a leaf has geometry when it has renderables
-                        virtual bool hasGeometry() const { return !mKdRenderables.empty(); };
+                        virtual bool hasGeometry() const { return !mKdRenderables.empty(); }
+
+                        // a leaf adds itself to the leaf set
+                        virtual void mergeLeaves(std::set<Leaf *>& leaves)      { leaves.insert(this); }
 
                         // a leaf never has children 
@@ -386 +410 @@
 
                         virtual void queueVisibleObjects(unsigned long currentFrame, 
-                                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes);
+                                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, bool fullVis = false);
 
                         virtual void getGeometryList(GtpVisibility::GeometryVector *geometryList);

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

@@ -51 +51 @@
         // enhanced visibility
         NodeVisibility getVisibilityEnhanced(const AxisAlignedBox& box) const;
+
+        // DEBUG
+        //mutable unsigned int mNumVisQueries;
 protected:
 

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

@@ -1188 +1188 @@
                 bool showBoxes, KdTree::NodeList& visibleNodes)
         {
+                // debug
+                //cam->mNumVisQueries = 0;
+
                 if (mKdRoot)
                         recQueueVisibleObjects(mKdRoot, Root::getSingleton().getCurrentFrameNumber(),
                                 cam, queue, onlyShadowCasters, showBoxes, visibleNodes);
+
+                //mBuildLog->logMessage("Frame # " + StringConverter::toString(Root::getSingleton().getCurrentFrameNumber()) +
+                //      " ," + StringConverter::toString(cam->mNumVisQueries) + " vis queries");
         }
 
@@ -1207 +1213 @@
                         visibleNodes.push_back(node);
 
-                        node->queueVisibleObjects(currentFrame, cam, queue, onlyShadowCasters, showBoxes);
-
-                        if (node->getLeftChild())
-                                recQueueVisibleObjects(node->getLeftChild(), currentFrame, 
-                                cam, queue, onlyShadowCasters, showBoxes, visibleNodes, 
-                                (fullVis || vis == KdTreeCamera::KDNV_FULL) ? true : false);
-                        if (node->getRightChild())
-                                recQueueVisibleObjects(node->getRightChild(), currentFrame, 
-                                cam, queue, onlyShadowCasters, showBoxes, visibleNodes, 
-                                (fullVis || vis == KdTreeCamera::KDNV_FULL) ? true : false);
+                        bool v = (fullVis || vis == KdTreeCamera::KDNV_FULL);
+                        node->queueVisibleObjects(currentFrame, cam, queue, onlyShadowCasters, showBoxes, v);
+
+                        if (!v)
+                        {
+
+                                if (node->getLeftChild())
+                                        recQueueVisibleObjects(node->getLeftChild(), currentFrame, 
+                                        cam, queue, onlyShadowCasters, showBoxes, visibleNodes, v);
+                                if (node->getRightChild())
+                                        recQueueVisibleObjects(node->getRightChild(), currentFrame, 
+                                        cam, queue, onlyShadowCasters, showBoxes, visibleNodes, v);
+                        }
                 }
         }
@@ -1366 +1375 @@
         //-------------------------------------------------------------------------
         void KdTree::Leaf::queueVisibleObjects(unsigned long currentFrame, 
-                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes)
+                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, bool fullVis)
         {
                 KdRenderableList::iterator it  = mKdRenderables.begin();

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

@@ -28 +28 @@
 {
         mEnhancedVisMode = enhanced;
-        //if (mEnhancedVisMode)
-        //      getVisibility = getVisibilityEnhanced;
-        //else
-        //      getVisibility = getVisibilitySimple;
 }
 
@@ -43 +39 @@
 KdTreeCamera::NodeVisibility KdTreeCamera::getVisibilityEnhanced(const AxisAlignedBox& box) const
 {
+        //++ mNumVisQueries;
         // Null boxes always invisible
         if ( box.isNull() )
@@ -101 +98 @@
 KdTreeCamera::NodeVisibility KdTreeCamera::getVisibilitySimple(const AxisAlignedBox& box) const
 {
+        //++ mNumVisQueries;
+
         // dummy
         FrustumPlane* culledBy = 0;