Changeset 42 for trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp

Timestamp:

04/12/05 10:50:19 (19 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp (modified) (4 diffs)

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp

@@ -16 +16 @@
                 mOcclusionCullingTerrainSceneTraverser = 
                         new OcclusionCullingTerrainSceneTraverser(this, mDestRenderSystem);
-                        //new OcclusionCullingSceneTraverser(this, mDestRenderSystem);
 
                 //mDisplayNodes = true;
                 //mShowBoundingBoxes = true;
                 mShowBoxes = true;
-                mMaxDepth = 20;
+                //mMaxDepth = 20;
         }
         //-----------------------------------------------------------------------
@@ -45 +44 @@
                 setSpecialCaseRenderQueueMode(SceneManager::SCRQM_EXCLUDE);
 
-                mOcclusionCullingTerrainSceneTraverser->renderScene(mCameraInProgress, mOctree);
-                //mOcclusionCullingTerrainSceneTraverser->renderScene(mCameraInProgress, mTerrainRoot);
-                //mOcclusionCullingTerrainSceneTraverser->renderScene(mCameraInProgress, mSceneRoot);
+                mOcclusionCullingTerrainSceneTraverser->setSceneRoot(mOctree);
+                mOcclusionCullingTerrainSceneTraverser->renderScene(mCameraInProgress);
+                
                 _deleteRenderedQueueGroups();
 
@@ -61 +60 @@
                 // must be empty because objects are found and rendered in an interleaved fashion
                 // in _renderVisibibleObjects 
+                //char *msg = "now finding visible objects\n"; OutputDebugString(msg);
         }
         //-----------------------------------------------------------------------
         void OcclusionCullingTerrainSceneManager::_updateSceneGraph(Camera* cam)
         {
-        mOcclusionCullingTerrainSceneTraverser->setNumSceneNodes(mSceneNodes.size());
-                //HACK
-                mOcclusionCullingTerrainSceneTraverser->setNumQueries(countOctreeSize(mOctree));
+                //char *msg = "now updating scenegraph\n"; OutputDebugString(msg);
+        mOcclusionCullingTerrainSceneTraverser->setNumSceneNodes((int)mSceneNodes.size());
                 mOcclusionCullingTerrainSceneTraverser->setRenderSystem(mDestRenderSystem);
+        //mOcclusionCullingTerrainSceneTraverser->preprocess();
+                mOcclusionCullingTerrainSceneTraverser->setNumOctreeNodes(mNumOctreeNodes);
 
-        mOcclusionCullingTerrainSceneTraverser->preprocess();
-                
                 TerrainSceneManager::_updateSceneGraph(cam);
         }
@@ -132 +131 @@
         }
         //-----------------------------------------------------------------------
-        unsigned int OcclusionCullingTerrainSceneManager::countOctreeSize(Octree *root)
+        /*unsigned int OcclusionCullingTerrainSceneManager::countNumOctrees(Octree *root)
         {
                 unsigned int result = 1;
                                 
-                for(int i=0; i<8; i++)
+                for(int i=0; i<8; ++i)
                 {
                         Octree *nextChild = root->mChildren[(i & 4) >> 2][(i & 2) >> 1][i & 1];
                 
                         if(nextChild != 0)
-                                result += countOctreeSize(nextChild);
+                                result += countNumOctrees(nextChild);
                 }
                 
                 return result;
-        }
+        }*/
 }