Changeset 39 for trunk/VUT/OcclusionCullingSceneManager/src

Timestamp:

04/05/05 17:39:03 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager/src

Files:

• OgreOcclusionCullingDotSceneManager.cpp (modified) (1 diff)
• OgreOcclusionCullingSceneTraverser.cpp (modified) (2 diffs)
• OgreOcclusionCullingTerrainSceneTraverser.cpp (modified) (1 diff)

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingDotSceneManager.cpp

@@ -31 +31 @@
                 addSpecialCaseRenderQueue(RENDER_QUEUE_BACKGROUND);
                 addSpecialCaseRenderQueue(RENDER_QUEUE_SKIES_EARLY);
-                
+        
                 setSpecialCaseRenderQueueMode(SceneManager::SCRQM_INCLUDE);
-                //DotSceneManager::_renderVisibleObjects( );
+                DotSceneManager::_renderVisibleObjects( );
                 _deleteRenderedQueueGroups();
 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneTraverser.cpp

@@ -118 +118 @@
                                         {
                                                 HardwareOcclusionQuery *query = issueOcclusionQuery(node, wasVisible);
-                                                queryQueue.push(query_pair(node, query));
+                                                queryQueue.push(QueryPair(node, query));
                                         }
                                         
@@ -322 +322 @@
                 for(int half = 0; half < 2; half ++)
                 {
+                        //static Matrix4 xform[256];
+
                         SolidHalfBoundingBox *box = getSolidHalfBoundingBox(half);
+                        box->setupBoundingBox(node->_getWorldAABB());
+
+                        mRenderSystem->_setWorldMatrix(Matrix4::IDENTITY);
                         
-                        box->setupBoundingBox(node->_getWorldAABB());
-
                         static RenderOperation ro;
+
                         mSceneManager->useRenderableViewProjMode(box);
                         box->getRenderOperation(ro);

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneTraverser.cpp

@@ -4 +4 @@
 namespace Ogre {
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::traverseNode( Camera *cam, SceneNode *node )
+        void OcclusionCullingTerrainSceneTraverser::traverseNode( Camera *cam, Octree *node )
         {
                 mNumTraversedNodes ++;
-                
-                if(node->numAttachedObjects() > 0)
+        
+        /*      if(node->numAttachedObjects() > 0)
                 {
                         renderSceneNode(cam, node);
-                }
+                }*/
 
-                // 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);
-                }
-        }
-/*      //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::renderSceneNode( Camera *cam, SceneNode *node )
-        {
-                setRenderingMode(MODE_RENDER);
-                
-                //HACK (too slow)
-                mSceneManager->_renderSceneNode(cam, node);
-                //MessageBox( NULL, "myplugin registered", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
-        }
-        //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneTraverser::isLeaf( SceneNode *node )
-        {
-                return (node->numChildren() == 0);
-        }
-        //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::pullUpVisibility( SceneNode *node )
-        {
-                while(node && !node->isNodeVisible())
+                for(int i=0; i<8; i++)
                 {
-                        node->setNodeVisible(true);
-                        node = static_cast<SceneNode *>(node->getParent());
+                        if(node->mChildren[i & 4][i & 2][i & 1] != 0)
+                                traverseNode(cam, node->mChildren[i & 4][i & 2][i & 1]);
                 }
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::renderBoundingBox( SceneNode *node )
+        void OcclusionCullingTerrainSceneTraverser::renderScene( Camera *cam, Octree *root )
         {
-                // Render two halfes of the bounding box (using triangle fans)
-                for(int half = 0; half < 2; half ++)
+                mNumTraversedNodes = 0;
+                mNumQueryCulledNodes = 0;
+                mNumFrustumCulledNodes = 0;
+                mNumRenderedGeometry = 0;
+                
+                mDistanceQueue = new OctreePriorityQueue(myless<Octree *>(cam));
+//              mDistanceQueue->push(root);
+                mCurrentTestIdx = 0;
+
+mCurrentAlgorithm = RENDER_CULL_FRUSTUM;
+                switch(mCurrentAlgorithm)
                 {
-                        SolidHalfBoundingBox *box = getSolidHalfBoundingBox(half);
-                        
-                        box->setupBoundingBox(node->_getWorldAABB());
+                        case RENDER_CULL_FRUSTUM:
+                                renderCullFrustum(cam);
+                        break;
+                /*      case RENDER_STOP_AND_WAIT:
+                                renderStopAndWait(cam);
+                                break;
+                        case RENDER_COHERENT:
+                                renderCoherentWithQueue(cam);
+                                break;*/
+                        default:
+                                renderCullFrustum(cam);
+                                break;
+                }       
+                
+//              delete mDistanceQueue;
 
-                        static RenderOperation ro;
-                        mSceneManager->useRenderableViewProjMode(box);
-                        box->getRenderOperation(ro);
-                        ro.srcRenderable = box; 
-                        mRenderSystem->_render(ro);
-
-                        //mSceneManager->renderSingleObject(getSolidHalfBoundingBox(half), 
-                        //      getSolidHalfBoundingBox(half)->getTechnique()->getPass(0), false);
-                }
+                mFrameId ++;
+        }
+        //-----------------------------------------------------------------------
+        void OcclusionCullingTerrainSceneTraverser::renderCullFrustum(Camera *cam)
+        {
+                /*while(!mDistanceQueue->empty())
+                {
+                        SceneNode *node = mDistanceQueue->top();
+                        mDistanceQueue->pop();
+        
+                        // interesting for visualization purpose
+                        node->setNodeVisible(false);
+                                
+                        if(cam->isVisible(node->_getWorldAABB()))
+                        {
+                                // update node's visited flag 
+                                node->setLastVisited(mFrameId);
+                                node->setNodeVisible(true);
+                                traverseNode(cam, node);
+                        }
+                        else
+                        {                       
+                                mNumFrustumCulledNodes ++;
+                        }
+                }*/
+        }       
+        //-----------------------------------------------------------------------
+/*      bool OcclusionCullingTerrainSceneTraverser::isLeaf( SceneNode *node )
+        {
+                return (node->numChildren() == 0);
         }*/
+        //-----------------------------------------------------------------------
+        void OcclusionCullingTerrainSceneTraverser::pullUpVisibility( Octree *node )
+        {
+        }
 }