Changeset 30 for trunk/VUT/OcclusionCullingSceneManager/src

Timestamp:

03/24/05 18:00:59 (19 years ago)

Author:

gametools

Message:

 

File:

• trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManager.cpp (modified) (17 diffs)

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManager.cpp

@@ -15 +15 @@
         OcclusionCullingSceneManager::OcclusionCullingSceneManager(): 
         mFrameId(1), mDistanceQueue(NULL), mVisibilityThreshold(0), mCurrentTestIdx(0),
-        mQueryMode(MODE_RENDER), mNumSceneNodes(0), mCurrentAlgorithm(RENDER_COHERENT)
+        mQueryMode(MODE_RENDER), mNumSceneNodes(0), mCurrentAlgorithm(RENDER_COHERENT),
+        mNumTraversedNodes(0), mNumQueryCulledNodes(0), mNumFrustumCulledNodes(0), mNumRenderedGeometry(0)
         {               
                 mHalfBoundingBox[0] = mHalfBoundingBox[1] = 0;
@@ -36 +37 @@
         void OcclusionCullingSceneManager::_renderVisibleObjects(void)
         {
+                mNumTraversedNodes = 0;
+                mNumQueryCulledNodes = 0;
+                mNumFrustumCulledNodes = 0;
+                mNumRenderedGeometry = 0;
+                
                 mDistanceQueue = new PriorityQueue(myless<SceneNode *>(mCameraInProgress));
-                
                 mDistanceQueue->push(mSceneRoot);
-
                 mCurrentTestIdx = 0;
-
                 //renderZPass();
 
@@ -62 +65 @@
                 delete mDistanceQueue;
 
-                /*mDestRenderSystem->_setDepthBufferParams(true, false, CMPF_LESS);
-                  SceneManager::_renderVisibleObjects();
-                  mDestRenderSystem->_setDepthBufferParams();
-          mDistanceQueue.push(mSceneRoot);
-                  Preprocess();
-                  //ResetQueries();
-                */
-                
                 mFrameId ++;
         }
@@ -102 +97 @@
                                         traverseNode(node);
                                 }
+                                else
+                                {
+                                        mNumQueryCulledNodes ++;
+                                }
                         }       
 
@@ -108 +107 @@
                         {
                                 SceneNode *node = mDistanceQueue->top();
-
                                 mDistanceQueue->pop();
         
@@ -134 +132 @@
                                         // always traverse a node if it was visible
                                         if(wasVisible)
+                                        {
                                                 traverseNode(node);
+                                        }
+                                }
+                                else
+                                {
+                                        mNumFrustumCulledNodes ++;
                                 }
                         }
@@ -157 +161 @@
                                 traverseNode(node);
                         }
+                        else
+                        {                       
+                                mNumFrustumCulledNodes ++;
+                        }
                 }
         }       
@@ -179 +187 @@
                                 query->pullOcclusionQuery(&visiblePixels);
                                 
-                                //char str[100]; sprintf(str, "number: %d, id: %d", (int)visiblePixels, mCurrentTestIdx);
-                                //MessageBox( NULL, str, "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
-
                                 // node visible
                                 if(visiblePixels > mVisibilityThreshold)
@@ -187 +192 @@
                                         traverseNode(node);
                                 }
-                        }                                       
+                                else
+                                {
+                                        mNumQueryCulledNodes ++;
+                                }
+                        }
+                        else
+                        {
+                                mNumFrustumCulledNodes ++;
+                        }
                 }
         }
@@ -203 +216 @@
                 /*
                 static RenderOperation ro;
-
-                // Issue view / projection changes if any
                 useRenderableViewProjMode(&box);
-
                 box.getRenderOperation(ro);
                 ro.srcRenderable = &box; 
@@ -237 +247 @@
         void OcclusionCullingSceneManager::traverseNode(SceneNode *node)
         {
-                if(isLeaf(node))
+                mNumTraversedNodes ++;
+
+                if(node->numAttachedObjects() > 0)
                 {
                         render(node);
                 }
-                else // internal node: add children to priority queue for further processing
-                {
-                        Node::ChildNodeIterator it = node->getChildIterator();
+
+                // internal node: add children to priority queue for further processing
+                Node::ChildNodeIterator it = node->getChildIterator();
                                         
-                        while (it.hasMoreElements())
-                        { 
-                                SceneNode* sceneChild = static_cast<SceneNode*>(it.getNext());
-                                mDistanceQueue->push(sceneChild);
-                        }
-                 }
+                while (it.hasMoreElements())                    
+                { 
+                        SceneNode* sceneChild = static_cast<SceneNode*>(it.getNext());
+                        mDistanceQueue->push(sceneChild);
+                }
         }
         //-----------------------------------------------------------------------
         void OcclusionCullingSceneManager::render(SceneNode *node)
         {
-                //setRenderingMode(MODE_RENDER);
-                //MessageBox( NULL, "harhar", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+                setRenderingMode(MODE_RENDER);
+                
                 //HACK (too slow)
                 node->_findVisibleObjects(mCameraInProgress, getRenderQueue(), false, 
@@ -266 +277 @@
         void OcclusionCullingSceneManager::_updateSceneGraph(Camera* cam)
         {
-                int numnodes = countSceneNodes(mSceneRoot);
-                
+                unsigned int numnodes = countSceneNodes(mSceneRoot);
+        
                 //-- initialise occlusion queries.
                 if(numnodes != mNumSceneNodes)
                 {
                         deleteQueries();
+                        
                         mNumSceneNodes = numnodes;
 
                         for(unsigned int i=0; i < mNumSceneNodes; i++)
                         {
-                                HardwareOcclusionQuery *hw = mDestRenderSystem->createHardwareOcclusionQuery();
-                                mOcclusionQueries.push_back(hw);
-                        }
+                                mOcclusionQueries.push_back(mDestRenderSystem->createHardwareOcclusionQuery());
+                        }       
                 }
 
@@ -284 +295 @@
         }
         //-----------------------------------------------------------------------
-        int OcclusionCullingSceneManager::countSceneNodes(SceneNode *node)
-        {
-                int num = 1;
-                if(isLeaf(node))
-                {
-                        return num;
-                }
-
+        unsigned int OcclusionCullingSceneManager::countSceneNodes(SceneNode *node)
+        {
+                unsigned int result = 1;
+                
                 Node::ChildNodeIterator it = node->getChildIterator();
                 
@@ -297 +304 @@
                 { 
                         SceneNode* sceneChild = static_cast<SceneNode*>(it.getNext());
-                        num += countSceneNodes(sceneChild);
+                        result += countSceneNodes(sceneChild);
         }
 
-                return num;
-        }
-        //-----------------------------------------------------------------------
-        int OcclusionCullingSceneManager::isLeaf(SceneNode *node)
+                return result;
+        }
+        //-----------------------------------------------------------------------
+        bool OcclusionCullingSceneManager::isLeaf(SceneNode *node)
         {
                 return (node->numChildren() == 0);
@@ -353 +360 @@
                         return true;
                 }
-        
+                if ( key == "Threshold" )
+                {
+                        mCurrentAlgorithm = * static_cast < const int * > ( val );
+                        return true;
+                }
+                
                 return SceneManager::setOption( key, val );
         }
@@ -362 +374 @@
                 {
                         * static_cast < int * > ( val ) = mCurrentAlgorithm;
+                        return true;
+                }
+                if ( key == "Threshold" )
+                {
+                        * static_cast < int * > ( val ) = mVisibilityThreshold;
+                        return true;
+                }
+                if ( key == "NumSceneNodes" )
+                {
+                        * static_cast < unsigned int * > ( val ) = mNumSceneNodes;
+                        return true;
+                }
+                if ( key == "NumTraversedNodes" )
+                {
+                        * static_cast < unsigned int * > ( val ) = mNumTraversedNodes;
+                        return true;
+                }
+                if ( key == "NumQueryCulledNodes" )
+                {
+                        * static_cast < unsigned int * > ( val ) = mNumQueryCulledNodes;
+                        return true;
+                }
+                if ( key == "NumFrustumCulledNodes" )
+                {
+                        * static_cast < unsigned int * > ( val ) = mNumFrustumCulledNodes;
                         return true;
                 }
@@ -377 +414 @@
                 SceneManager::getOptionKeys( refKeys );
                 refKeys.push_back( "Algorithm" );
-        
+                refKeys.push_back( "Threshold" );
+                refKeys.push_back( "NumSceneNodes" );
+                refKeys.push_back( "NumTraversedNodes" );
+                refKeys.push_back( "NumQueryCulledNodes" );
+                refKeys.push_back( "NumFrustumCulledNodes" );
+                //refKeys.push_back( "mNumRenderedGeometry" );
                 return true;
         }