Changeset 48 for trunk/VUT/OcclusionCullingSceneManager/src

Timestamp:

04/13/05 09:37:20 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager/src

Files:

• OgreOcclusionCullingOctreeSceneTraverser.cpp (modified) (12 diffs)
• OgreOcclusionCullingSceneManagerDll.cpp (modified) (1 diff)
• OgreOcclusionCullingTerrainSceneManager.cpp (modified) (6 diffs)

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingOctreeSceneTraverser.cpp

@@ -1 +1 @@
 #include "OgreOcclusionCullingOctreeSceneTraverser.h"
-#include "OgreOcclusionCullingTerrainSceneManager.h"
+#include "OgreOcclusionCullingOctreeSceneManager.h"
 #include "OgreHardwareOcclusionQuery.h"
 
@@ -7 +7 @@
 namespace Ogre {
         //-----------------------------------------------------------------------
-        OcclusionCullingTerrainSceneTraverser::OcclusionCullingTerrainSceneTraverser(SceneManager *sm, RenderSystem *rsys): 
+        OcclusionCullingOctreeSceneTraverser::OcclusionCullingOctreeSceneTraverser(SceneManager *sm, RenderSystem *rsys): 
         OcclusionCullingSceneTraverser(sm, rsys), mOctreeSceneRoot(0), mOctreeDistanceQueue(0)
         {
         }
         //-----------------------------------------------------------------------
-        OcclusionCullingTerrainSceneTraverser::~OcclusionCullingTerrainSceneTraverser()
+        OcclusionCullingOctreeSceneTraverser::~OcclusionCullingOctreeSceneTraverser()
         {               
                 if(mOctreeDistanceQueue)
@@ -18 +18 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::traverseOctant(Camera *cam, Octree *octant )
+        void OcclusionCullingOctreeSceneTraverser::traverseOctant(Camera *cam, Octree *octant )
         {
                 mNumTraversedNodes ++;
@@ -34 +34 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::renderCullFrustum(Camera *cam)
+        void OcclusionCullingOctreeSceneTraverser::renderCullFrustum(Camera *cam)
         {
                 AxisAlignedBox box;
@@ -63 +63 @@
         //-----------------------------------------------------------------------
         /** Renders the scene with the hierarchical stop and wait algorithm. */
-        void OcclusionCullingTerrainSceneTraverser::renderStopAndWait( Camera *cam )
+        void OcclusionCullingOctreeSceneTraverser::renderStopAndWait( Camera *cam )
         {
                 AxisAlignedBox box;
@@ -114 +114 @@
         //-----------------------------------------------------------------------
         /** Renders the scene with the coherent hierarchical algorithm and the query queye. */
-        void OcclusionCullingTerrainSceneTraverser::renderCoherentWithQueue( Camera *cam )
+        void OcclusionCullingOctreeSceneTraverser::renderCoherentWithQueue( Camera *cam )
         {
                 OctreeQueryQueue queryQueue;
@@ -204 +204 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::pullUpVisibility( Camera *cam, Octree *octant )
+        void OcclusionCullingOctreeSceneTraverser::pullUpVisibility( Camera *cam, Octree *octant )
         {
                 while(octant && !octant->isOctreeVisible())
@@ -216 +216 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::renderOctant( Camera *cam, Octree *octant )
+        void OcclusionCullingOctreeSceneTraverser::renderOctant( Camera *cam, Octree *octant )
         {
                 //if(octant->numNodes() > 0)
@@ -224 +224 @@
 
                         octant->setLastRendered(octant->lastVisited());
-                        ((OcclusionCullingTerrainSceneManager *)mSceneManager)->_renderOctant(cam, octant);
+                        ((OcclusionCullingOctreeSceneManager *)mSceneManager)->_renderOctant(cam, octant);
                 }
                 else OutputDebugString("already rendered");
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::setSceneRoot(Octree *root)
+        void OcclusionCullingOctreeSceneTraverser::setSceneRoot(Octree *root)
         {
                 mOctreeSceneRoot = root;
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::initDistanceQueue(Camera *cam)
+        void OcclusionCullingOctreeSceneTraverser::initDistanceQueue(Camera *cam)
         {
                 if(mOctreeDistanceQueue)
@@ -243 +243 @@
         }
         //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneTraverser::isLeaf(Octree *octant)
+        bool OcclusionCullingOctreeSceneTraverser::isLeaf(Octree *octant)
         {
                 for(int i=0; i<8; i++)
@@ -254 +254 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::setNumOctreeNodes(unsigned int num)
+        void OcclusionCullingOctreeSceneTraverser::setNumOctreeNodes(unsigned int num)
         {
                 mNumOctreeNodes = num;
         }
         //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneTraverser::getOption( const String & key, void *val )
+        bool OcclusionCullingOctreeSceneTraverser::getOption( const String & key, void *val )
         {
                 if ( key == "NumOctreeNodes" )
@@ -270 +270 @@
         }
         //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneTraverser::getOptionKeys( StringVector & refKeys )
+        bool OcclusionCullingOctreeSceneTraverser::getOptionKeys( StringVector & refKeys )
         {
                 refKeys.push_back( "NumOctreeNodes" );

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManagerDll.cpp

@@ -25 +25 @@
 
 #include "OgreOcclusionCullingTerrainSceneManager.h"
-#include "OgreOcclusionCullingSceneManager.h"
-#include "OgreOcclusionCullingDotSceneManager.h"
+#include "OgreOcclusionCullingOctreeSceneManager.h"
+//#include "OgreOcclusionCullingDotSceneManager.h"
 #include "OgreHeightmapTerrainPageSource.h"
 #include <OgreRoot.h>

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp

@@ -13 +13 @@
         OcclusionCullingTerrainSceneManager::OcclusionCullingTerrainSceneManager()
         {
-                mOcclusionCullingTerrainSceneTraverser = 
-                        new OcclusionCullingTerrainSceneTraverser(this, mDestRenderSystem);
+                mOcclusionCullingOctreeSceneTraverser = 
+                        new OcclusionCullingOctreeSceneTraverser(this, mDestRenderSystem);
 
                 //mDisplayNodes = true;
@@ -24 +24 @@
         OcclusionCullingTerrainSceneManager::~OcclusionCullingTerrainSceneManager()
         {
-                delete mOcclusionCullingTerrainSceneTraverser;
+                delete mOcclusionCullingOctreeSceneTraverser;
         }
         //-----------------------------------------------------------------------
@@ -43 +43 @@
                 setSpecialCaseRenderQueueMode(SceneManager::SCRQM_EXCLUDE);
 
-                mOcclusionCullingTerrainSceneTraverser->setSceneRoot(mOctree);
-                mOcclusionCullingTerrainSceneTraverser->renderScene(mCameraInProgress);
+                mOcclusionCullingOctreeSceneTraverser->setSceneRoot(mOctree);
+                mOcclusionCullingOctreeSceneTraverser->renderScene(mCameraInProgress);
                 
                 _deleteRenderedQueueGroups();
@@ -67 +67 @@
                 //mOcclusionCullingTerrainSceneTraverser->preprocess();
 
-        mOcclusionCullingTerrainSceneTraverser->setNumSceneNodes((int)mSceneNodes.size());
-                mOcclusionCullingTerrainSceneTraverser->setRenderSystem(mDestRenderSystem);
+        mOcclusionCullingOctreeSceneTraverser->setNumSceneNodes((int)mSceneNodes.size());
+                mOcclusionCullingOctreeSceneTraverser->setRenderSystem(mDestRenderSystem);
         
-                mOcclusionCullingTerrainSceneTraverser->setNumOctreeNodes(mNumOctreeNodes);
+                mOcclusionCullingOctreeSceneTraverser->setNumOctreeNodes(mNumOctreeNodes);
 
                 TerrainSceneManager::_updateSceneGraph(cam);
@@ -77 +77 @@
         bool OcclusionCullingTerrainSceneManager::setOption( const String & key, const void * val )
         {
-                return mOcclusionCullingTerrainSceneTraverser->setOption( key, val) || TerrainSceneManager::setOption( key, val );
+                return mOcclusionCullingOctreeSceneTraverser->setOption( key, val) || TerrainSceneManager::setOption( key, val );
         }
         //-----------------------------------------------------------------------
         bool OcclusionCullingTerrainSceneManager::getOption( const String & key, void *val )
         {
-                return mOcclusionCullingTerrainSceneTraverser->getOption( key, val) || TerrainSceneManager::getOption( key, val ) ;
+                return mOcclusionCullingOctreeSceneTraverser->getOption( key, val) || TerrainSceneManager::getOption( key, val ) ;
         }
         //-----------------------------------------------------------------------
@@ -92 +92 @@
         bool OcclusionCullingTerrainSceneManager::getOptionKeys( StringVector & refKeys )
         {
-                return mOcclusionCullingTerrainSceneTraverser->getOptionKeys ( refKeys ) || TerrainSceneManager::getOptionKeys( refKeys );
+                return mOcclusionCullingOctreeSceneTraverser->getOptionKeys ( refKeys ) || TerrainSceneManager::getOptionKeys( refKeys );
         }
         //-----------------------------------------------------------------------