Changeset 33 for trunk/VUT/OcclusionCullingSceneManager/src

Timestamp:

03/30/05 11:36:07 (19 years ago)

Author:

Mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager/src

Files:

• OgreOcclusionCullingDotSceneManager.cpp (added)
• OgreOcclusionCullingSceneManager.cpp (modified) (6 diffs)
• OgreOcclusionCullingSceneManagerDll.cpp (modified) (1 diff)
• OgreOcclusionCullingSceneTraverser.cpp (modified) (4 diffs)
• OgreOcclusionCullingTerrainSceneManager.cpp (added)
• OgreTerrainOcclusionCullingSceneManager.cpp (deleted)

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManager.cpp

@@ -15 +15 @@
         OcclusionCullingSceneManager::OcclusionCullingSceneManager()
         {
+                mOcclusionCullingSceneTraverser = new OcclusionCullingSceneTraverser(this, mDestRenderSystem);
+        }
+        //-----------------------------------------------------------------------
+        OcclusionCullingSceneManager::~OcclusionCullingSceneManager()
+        {
+                delete mOcclusionCullingSceneTraverser;
         }
         //-----------------------------------------------------------------------
@@ -24 +30 @@
         void OcclusionCullingSceneManager::_renderVisibleObjects( void )
         {
-                mSceneTraverser.renderScene(mCameraInProgress, mSceneRoot);
+                mOcclusionCullingSceneTraverser->renderScene(mCameraInProgress, mSceneRoot);
         }
         //-----------------------------------------------------------------------
@@ -34 +40 @@
         void OcclusionCullingSceneManager::_updateSceneGraph( Camera* cam )
         {
-                mSceneTraverser.preprocess();
+                mOcclusionCullingSceneTraverser->setNumSceneNodes(mSceneNodes.size());
+                mOcclusionCullingSceneTraverser->preprocess();
                 
                 SceneManager::_updateSceneGraph(cam);
@@ -41 +48 @@
         bool OcclusionCullingSceneManager::setOption( const String & key, const void * val )
         {
-                mSceneTraverser.setOption(key, val);
+                mOcclusionCullingSceneTraverser->setOption(key, val);
                         
                 return SceneManager::setOption( key, val );
@@ -48 +55 @@
         bool OcclusionCullingSceneManager::getOption( const String & key, void *val )
         {
-                mSceneTraverser.getOption(key, val);
+                mOcclusionCullingSceneTraverser->getOption(key, val);
                 
                 return SceneManager::getOption( key, val );
@@ -62 +69 @@
                 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" );
+                mOcclusionCullingSceneTraverser->getOptionKeys( refKeys );
+
                 return true;
         }

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManagerDll.cpp

@@ -24 +24 @@
 */
 
-//#include "OgreOcclusionCullingSceneManager.h"
-//#include "OgreTerrainOcclusionCullingSceneManager.h"
-#include <OgreOctreeSceneManager.h>
-#include <OgreTerrainSceneManager.h>
+#include "OgreOcclusionCullingTerrainSceneManager.h"
+#include "OgreOcclusionCullingSceneManager.h"
+#include "OgreOcclusionCullingDotSceneManager.h"
 #include <OgreRoot.h>
-#include "OgreHeightmapTerrainPageSource.h"
+
+//#include "OgreHeightmapTerrainPageSource.h"
 //#include <windows.h>
 
 namespace Ogre {
 
-    //OcclusionCullingSceneManager *occlusionPlugin;
-        //TerrainOcclusionCullingSceneManager *terrainOcclusionPlugin;
-        OctreeSceneManager *ocPlugin;
-
+    OcclusionCullingSceneManager *occlusionPlugin;
+        OcclusionCullingTerrainSceneManager *occlusionTerrainPlugin;
+        
     //-----------------------------------------------------------------------
     extern "C" void dllStartPlugin(void)
     {
                 // Create new scene manager
-        //      occlusionPlugin = new OcclusionCullingSceneManager();
-                ocPlugin = new OctreeSceneManager();
+                occlusionPlugin = new OcclusionCullingSceneManager();
+                occlusionTerrainPlugin = new OcclusionCullingTerrainSceneManager();
     
             // Register
-                //Root::getSingleton().setSceneManager( ST_GENERIC, occlusionPlugin );
-//              Root::getSingleton().setSceneManager( ST_EXTERIOR_CLOSE, terrainOcclusionPlugin );
-                Root::getSingleton().setSceneManager( ST_EXTERIOR_CLOSE, ocPlugin );
-
-                //MessageBox( NULL, "myplugin registered", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+                Root::getSingleton().setSceneManager( ST_GENERIC, occlusionPlugin );
+                Root::getSingleton().setSceneManager( ST_EXTERIOR_CLOSE, occlusionTerrainPlugin );
+                
+                // MessageBox( NULL, "myplugin registered", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
     }
     extern "C" void dllStopPlugin(void)
     {
-      //  delete occlusionPlugin;
-                delete ocPlugin;
-                //delete terrainOcclusionPlugin;
+        delete occlusionPlugin;
+                delete occlusionTerrainPlugin;
     }
 }

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneTraverser.cpp

@@ -7 +7 @@
 #include "OgreSolidHalfBoundingBox.h"
 
+
 #include <windows.h>
 
@@ -12 +13 @@
         
         //-----------------------------------------------------------------------
-        OcclusionCullingSceneTraverser::OcclusionCullingSceneTraverser(): 
+        OcclusionCullingSceneTraverser::OcclusionCullingSceneTraverser(SceneManager *sm, RenderSystem *rsys): 
         mFrameId(1), mDistanceQueue(NULL), mVisibilityThreshold(0), mCurrentTestIdx(0),
         mQueryMode(MODE_RENDER), mNumSceneNodes(0), mCurrentAlgorithm(RENDER_COHERENT),
         mNumTraversedNodes(0), mNumQueryCulledNodes(0), mNumFrustumCulledNodes(0), 
-        mNumRenderedGeometry(0), mSceneManager(0), mRenderSystem(0)
+        mNumRenderedGeometry(0), mSceneManager(sm), mRenderSystem(rsys)
         {               
                 mHalfBoundingBox[0] = mHalfBoundingBox[1] = 0;
@@ -257 +258 @@
                 //-- initialise occlusion queries.
                 deleteQueries();
-                        
+                
                 for(unsigned int i=0; i < mNumSceneNodes; i++)
                 {
@@ -389 +390 @@
                 return false;
         }
+        //-----------------------------------------------------------------------
+        bool OcclusionCullingSceneTraverser::getOptionKeys( StringVector & 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;
+        }
+        //-----------------------------------------------------------------------
+        void OcclusionCullingSceneTraverser::setNumSceneNodes(int num)
+        {
+                mNumSceneNodes = num;
+        }
 }