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

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/src

Files:

• OgreKdTree.cpp (modified) (3 diffs)
• OgreKdTreeCamera.cpp (modified) (3 diffs)

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;