Changeset 37 for trunk/VUT/OcclusionCullingSceneManager/src

Timestamp:

04/01/05 17:28:57 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager/src

Files:

• OgreOcclusionCullingDotSceneManager.cpp (modified) (3 diffs)
• OgreOcclusionCullingSceneManager.cpp (modified) (2 diffs)
• OgreOcclusionCullingSceneManagerDll.cpp (modified) (2 diffs)
• OgreOcclusionCullingSceneTraverser.cpp (modified) (7 diffs)
• OgreOcclusionCullingTerrainSceneTraverser.cpp (modified) (3 diffs)

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingDotSceneManager.cpp

@@ -15 +15 @@
         {
                 mOcclusionCullingSceneTraverser = new OcclusionCullingSceneTraverser(this, mDestRenderSystem);
+                //mDisplayNodes = true;
+                mShowBoundingBoxes = true;
+                //mShowBoxes = true;
         }
         //-----------------------------------------------------------------------
@@ -24 +27 @@
         void OcclusionCullingDotSceneManager::_renderVisibleObjects(void)
         {
+                DotSceneManager::_renderVisibleObjects( );
+                getRenderQueue()->clear();
+
                 mOcclusionCullingSceneTraverser->renderScene(mCameraInProgress, mSceneRoot);
         }
@@ -35 +41 @@
         void OcclusionCullingDotSceneManager::_updateSceneGraph(Camera* cam)
         {
+                mOcclusionCullingSceneTraverser->setNumSceneNodes(mSceneNodes.size());
+                mOcclusionCullingSceneTraverser->setRenderSystem(mDestRenderSystem);
+
         mOcclusionCullingSceneTraverser->preprocess();
-
+                
                 DotSceneManager::_updateSceneGraph(cam);
         }

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManager.cpp

@@ -31 +31 @@
         {
                 mOcclusionCullingSceneTraverser->renderScene(mCameraInProgress, mSceneRoot);
+                SceneManager::_renderVisibleObjects( );
         }
         //-----------------------------------------------------------------------
@@ -41 +42 @@
         {
                 mOcclusionCullingSceneTraverser->setNumSceneNodes(mSceneNodes.size());
-                mOcclusionCullingSceneTraverser->preprocess();
+                mOcclusionCullingSceneTraverser->setRenderSystem(mDestRenderSystem);
+
+        mOcclusionCullingSceneTraverser->preprocess();
                 
                 SceneManager::_updateSceneGraph(cam);

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManagerDll.cpp

@@ -34 +34 @@
 namespace Ogre {
 
-    OcclusionCullingSceneManager *occlusionPlugin;
+    OcclusionCullingDotSceneManager *occlusionPlugin;
         OcclusionCullingTerrainSceneManager *occlusionTerrainPlugin;
         HeightmapTerrainPageSource* heightmapTerrainPageSource;
@@ -42 +42 @@
     {
                 // Create new scene manager
-                occlusionPlugin = new OcclusionCullingSceneManager();
+                occlusionPlugin = new OcclusionCullingDotSceneManager();
                 occlusionTerrainPlugin = new OcclusionCullingTerrainSceneManager();
                 heightmapTerrainPageSource = new HeightmapTerrainPageSource();

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneTraverser.cpp

@@ -42 +42 @@
                 mCurrentTestIdx = 0;
 
-                mCurrentAlgorithm = RENDER_CULL_FRUSTUM;
+                //mCurrentAlgorithm = RENDER_CULL_FRUSTUM;
                 switch(mCurrentAlgorithm)
                 {
@@ -145 +145 @@
                         node->setNodeVisible(false);
                                 
-                        if(!cam->isVisible(node->_getWorldAABB()))
+                        if(cam->isVisible(node->_getWorldAABB()))
                         {
                                 // update node's visited flag 
@@ -152 +152 @@
                                 traverseNode(cam, node);
                         }
-                        //else
-                                if(cam->isVisible(node->_getWorldAABB()))
-                                {
-                                        mNumQueryCulledNodes ++;
-                                }else
+                        else
                         {                       
                                 mNumFrustumCulledNodes ++;
@@ -203 +199 @@
                 // change state so the bounding box gets not actually rendered on the screen
                 setRenderingMode(MODE_QUERY);
+                //setRenderingMode(MODE_RENDER);
 
                 // get next available test id
@@ -257 +254 @@
                 //HACK (too slow)
                 mSceneManager->_renderSceneNode(cam, node);
-                //MessageBox( NULL, "myplugin registered", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
         }
         //-----------------------------------------------------------------------
@@ -265 +261 @@
                 deleteQueries();
                 
+                //char str[100];sprintf(str, "num nodes: %d", mNumSceneNodes);
+                //MessageBox( NULL, str, "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+
                 for(unsigned int i=0; i < mNumSceneNodes; i++)
                 {
@@ -312 +311 @@
         void OcclusionCullingSceneTraverser::deleteQueries( void )
         {
-                for(unsigned int i=0; i < mNumSceneNodes; i++)
+                for(unsigned int i=0; i < mOcclusionQueries.size(); i++)
                         delete mOcclusionQueries[i];
 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneTraverser.cpp

@@ -22 +22 @@
                 }
         }
-        //-----------------------------------------------------------------------
+/*      //-----------------------------------------------------------------------
         void OcclusionCullingTerrainSceneTraverser::renderSceneNode( Camera *cam, SceneNode *node )
         {
@@ -31 +31 @@
                 //MessageBox( NULL, "myplugin registered", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
         }
-        //-----------------------------------------------------------------------
-        /*unsigned int OcclusionCullingSceneManager::countSceneNodes(SceneNode *node)
-        {
-                unsigned int result = 1;
-                
-                Node::ChildNodeIterator it = node->getChildIterator();
-                
-                while (it.hasMoreElements())
-                { 
-                        SceneNode* sceneChild = static_cast<SceneNode*>(it.getNext());
-                        result += countSceneNodes(sceneChild);
-        }
-
-                return result;
-        }*/
         //-----------------------------------------------------------------------
         bool OcclusionCullingTerrainSceneTraverser::isLeaf( SceneNode *node )
@@ -79 +64 @@
                         //      getSolidHalfBoundingBox(half)->getTechnique()->getPass(0), false);
                 }
-        }
+        }*/
 }