Changeset 45

Timestamp:

04/13/05 00:36:07 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager

Files:

• TestCulling/TestCulling.vcproj (modified) (2 diffs)
• include/OgreOcclusionCullingOctreeSceneManager.h (modified) (1 diff)
• include/OgreOcclusionCullingOctreeSceneTraverser.h (added)
• include/OgreOcclusionCullingTerrainSceneManager.h (modified) (2 diffs)
• include/OgreOcclusionCullingTerrainSceneTraverser.h (deleted)
• scripts/Plugin_OcclusionCullingSceneManager.sln (modified) (2 diffs)
• scripts/Plugin_OcclusionCullingSceneManager.suo (modified) (previous)
• scripts/Plugin_OcclusionCullingSceneManager.vcproj (modified) (3 diffs)
• src/OgreOcclusionCullingOctreeSceneManager.cpp (modified) (7 diffs)
• src/OgreOcclusionCullingOctreeSceneTraverser.cpp (added)
• src/OgreOcclusionCullingSceneManagerDll.cpp (modified) (4 diffs)
• src/OgreOcclusionCullingTerrainSceneTraverser.cpp (deleted)

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCulling.vcproj

@@ -122 +122 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
-                                RelativePath=".\TerrainContentGenerator.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\TestCullingApplication.cpp">
                         </File>
@@ -132 +129 @@
                         Filter="h;hpp;hxx;hm;inl;inc;xsd"
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-                        <File
-                                RelativePath=".\TerrainContentGenerator.h">
-                        </File>
                         <File
                                 RelativePath=".\TestCullingApplication.h">

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingOctreeSceneManager.h

@@ -10 +10 @@
 
 #include "OgrePrerequisites.h"
-#include "OgreOcclusionCullingTerrainSceneTraverser.h"
+#include "OgreOcclusionCullingOctreeSceneTraverser.h"
 //#include "OgreSolidHalfBoundingBox.h"
 

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingTerrainSceneManager.h

@@ -10 +10 @@
 
 #include "OgrePrerequisites.h"
-#include "OgreOcclusionCullingTerrainSceneTraverser.h"
+#include "OgreOcclusionCullinOctreeSceneTraverser.h"
 //#include "OgreSolidHalfBoundingBox.h"
 
@@ -55 +55 @@
 
         protected:
-                /** Recursively counts octree size (i.e., number of octree instances)
-                @param root current octree
-                */
-                //unsigned int countOctreeSize(Octree *root);
 
-                OcclusionCullingTerrainSceneTraverser *mOcclusionCullingTerrainSceneTraverser;
+                OcclusionCullingOctreeSceneTraverser *mOcclusionCullingOctreeSceneTraverser;
         };
 

trunk/VUT/OcclusionCullingSceneManager/scripts/Plugin_OcclusionCullingSceneManager.sln

@@ -11 +11 @@
         ProjectSection(ProjectDependencies) = postProject
                 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} = {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCullingTerrain", "..\TestCullingTerrain\TestCullingTerrain.vcproj", "{248F19A6-2FE0-4F5D-8928-E0EA10609887}"
+        ProjectSection(ProjectDependencies) = postProject
         EndProjectSection
 EndProject
@@ -31 +35 @@
                 {BE13944C-D05E-467F-B0AC-8A65A3B5FE60}.Release.ActiveCfg = Release|Win32
                 {BE13944C-D05E-467F-B0AC-8A65A3B5FE60}.Release.Build.0 = Release|Win32
+                {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Debug.ActiveCfg = Debug|Win32
+                {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Debug.Build.0 = Debug|Win32
+                {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release.ActiveCfg = Release|Win32
+                {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(ExtensibilityGlobals) = postSolution

trunk/VUT/OcclusionCullingSceneManager/scripts/Plugin_OcclusionCullingSceneManager.vcproj

@@ -181 +181 @@
                 </Filter>
                 <Filter
-                        Name="TerrainSceneManager"
+                        Name="OctreeOcclusionCullingSceneManager"
                         Filter="">
                         <Filter
@@ -187 +187 @@
                                 Filter="">
                                 <File
+                                        RelativePath="..\src\OgreOcclusionCullingOctreeSceneManager.cpp">
+                                </File>
+                                <File
+                                        RelativePath="..\src\OgreOcclusionCullingOctreeSceneTraverser.cpp">
+                                </File>
+                                <File
                                         RelativePath="..\src\OgreOcclusionCullingTerrainSceneManager.cpp">
                                 </File>
-                                <File
-                                        RelativePath="..\src\OgreOcclusionCullingTerrainSceneTraverser.cpp">
-                                </File>
                         </Filter>
                         <Filter
@@ -197 +200 @@
                                 Filter="">
                                 <File
+                                        RelativePath="..\include\OgreOcclusionCullingOctreeSceneManager.h">
+                                </File>
+                                <File
+                                        RelativePath="..\include\OgreOcclusionCullingOctreeSceneTraverser.h">
+                                </File>
+                                <File
                                         RelativePath="..\include\OgreOcclusionCullingTerrainSceneManager.h">
                                 </File>
-                                <File
-                                        RelativePath="..\include\OgreOcclusionCullingTerrainSceneTraverser.h">
-                                </File>
-                        </Filter>
-                </Filter>
-                <Filter
-                        Name="DotSceneManager"
+                        </Filter>
+                </Filter>
+                <Filter
+                        Name="DotSceneOcclusionCullingSceneManager"
                         Filter="">
                         <Filter

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingOctreeSceneManager.cpp

@@ -1 @@
-#include "OgreOcclusionCullingTerrainSceneManager.h"
+#include "OgreOcclusionCullingOctreeSceneManager.h"
 #include "OgreMath.h"
 #include "OgreIteratorWrappers.h"
 #include "OgreRenderSystem.h"
 #include "OgreCamera.h"
-#include "OgreHardwareOcclusionQuery.h"
-#include "OgreSolidHalfBoundingBox.h"
 
 #include <windows.h>
@@ -11 +9 @@
 namespace Ogre {
         //-----------------------------------------------------------------------
-        OcclusionCullingTerrainSceneManager::OcclusionCullingTerrainSceneManager()
+        OcclusionCullingOctreeSceneManager::OcclusionCullingOctreeSceneManager()
         {
-                mOcclusionCullingTerrainSceneTraverser = 
-                        new OcclusionCullingTerrainSceneTraverser(this, mDestRenderSystem);
+                mOcclusionCullingOctreeSceneTraverser = 
+                        new OcclusionCullingOctreeSceneTraverser(this, mDestRenderSystem);
 
                 //mDisplayNodes = true;
@@ -22 +20 @@
         }
         //-----------------------------------------------------------------------
-        OcclusionCullingTerrainSceneManager::~OcclusionCullingTerrainSceneManager()
+        OcclusionCullingOctreeSceneManager::~OcclusionCullingOctreeSceneManager()
         {
-                delete mOcclusionCullingTerrainSceneTraverser;
+                delete mOcclusionCullingOctreeSceneTraverser;
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneManager::_renderVisibleObjects(void)
+        void OcclusionCullingOctreeSceneManager::_renderVisibleObjects(void)
         {
                 //-- render background
@@ -43 +41 @@
                 setSpecialCaseRenderQueueMode(SceneManager::SCRQM_EXCLUDE);
 
-                mOcclusionCullingTerrainSceneTraverser->setSceneRoot(mOctree);
-                mOcclusionCullingTerrainSceneTraverser->renderScene(mCameraInProgress);
+                mOcclusionCullingOctreeSceneTraverser->setSceneRoot(mOctree);
+                mOcclusionCullingOctreeSceneTraverser->renderScene(mCameraInProgress);
                 
                 _deleteRenderedQueueGroups();
@@ -55 +53 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneManager::_findVisibleObjects(Camera* cam, bool onlyShadowCasters)
+        void OcclusionCullingOctreeSceneManager::_findVisibleObjects(Camera* cam, bool onlyShadowCasters)
         {
                 // must be empty because objects are found and rendered in an interleaved fashion
@@ -62 +60 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneManager::_updateSceneGraph(Camera* cam)
+        void OcclusionCullingOctreeSceneManager::_updateSceneGraph(Camera* cam)
         {
                 //char *msg = "now updating scenegraph\n"; OutputDebugString(msg);
-                //mOcclusionCullingTerrainSceneTraverser->preprocess();
+                //mOcclusionCullingOctreeSceneTraverser->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);
+                OctreeSceneManager::_updateSceneGraph(cam);
         }
         //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneManager::setOption( const String & key, const void * val )
+        bool OcclusionCullingOctreeSceneManager::setOption( const String & key, const void * val )
         {
-                return mOcclusionCullingTerrainSceneTraverser->setOption( key, val) || TerrainSceneManager::setOption( key, val );
+                return mOcclusionCullingOctreeSceneTraverser->setOption( key, val) || OctreeSceneManager::setOption( key, val );
         }
         //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneManager::getOption( const String & key, void *val )
+        bool OcclusionCullingOctreeSceneManager::getOption( const String & key, void *val )
         {
-                return mOcclusionCullingTerrainSceneTraverser->getOption( key, val) || TerrainSceneManager::getOption( key, val ) ;
+                return mOcclusionCullingOctreeSceneTraverser->getOption( key, val) || OctreeSceneManager::getOption( key, val ) ;
         }
         //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneManager::getOptionValues( const String & key, StringVector  &refValueList )
+        bool OcclusionCullingOctreeSceneManager::getOptionValues( const String & key, StringVector  &refValueList )
         {
-                return TerrainSceneManager::getOptionValues( key, refValueList );
+                return OctreeSceneManager::getOptionValues( key, refValueList );
         }
         //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneManager::getOptionKeys( StringVector & refKeys )
+        bool OcclusionCullingOctreeSceneManager::getOptionKeys( StringVector & refKeys )
         {
-                return mOcclusionCullingTerrainSceneTraverser->getOptionKeys ( refKeys ) || TerrainSceneManager::getOptionKeys( refKeys );
+                return mOcclusionCullingOctreeSceneTraverser->getOptionKeys ( refKeys ) || OctreeSceneManager::getOptionKeys( refKeys );
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneManager::_renderOctant(Camera *cam, Octree *octant)
+        void OcclusionCullingOctreeSceneManager::_renderOctant(Camera *cam, Octree *octant)
         {
                 //Add stuff to be rendered;
@@ -131 +129 @@
                 _deleteRenderedQueueGroups();
         }
-        //-----------------------------------------------------------------------
-        /*unsigned int OcclusionCullingTerrainSceneManager::countNumOctrees(Octree *root)
-        {
-                unsigned int result = 1;
-                                
-                for(int i=0; i<8; ++i)
-                {
-                        Octree *nextChild = root->mChildren[(i & 4) >> 2][(i & 2) >> 1][i & 1];
-                
-                        if(nextChild != 0)
-                                result += countNumOctrees(nextChild);
-                }
-                
-                return result;
-        }*/
 }       

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManagerDll.cpp

@@ -34 +34 @@
 namespace Ogre {
 
-    OcclusionCullingDotSceneManager *occlusionPlugin;
+   // OcclusionCullingDotSceneManager *occlusionDotPlugin;
+        OcclusionCullingOctreeSceneManager *occlusionOctreePlugin;
         OcclusionCullingTerrainSceneManager *occlusionTerrainPlugin;
         HeightmapTerrainPageSource* heightmapTerrainPageSource;
@@ -42 +43 @@
     {
                 // Create new scene manager
-                occlusionPlugin = new OcclusionCullingDotSceneManager();
+                //occlusionDotPlugin = new OcclusionCullingDotSceneManager();
+                occlusionOctreePlugin = new OcclusionCullingOctreeSceneManager();
                 occlusionTerrainPlugin = new OcclusionCullingTerrainSceneManager();
                 heightmapTerrainPageSource = new HeightmapTerrainPageSource();
@@ -49 +51 @@
 
             // Register
-                Root::getSingleton().setSceneManager( ST_GENERIC, occlusionPlugin );
+                //Root::getSingleton().setSceneManager( ST_GENERIC, occlusionDotPlugin );
+                Root::getSingleton().setSceneManager( ST_GENERIC, occlusionOctreePlugin );
                 Root::getSingleton().setSceneManager( ST_EXTERIOR_CLOSE, occlusionTerrainPlugin );
                 
@@ -57 +60 @@
     {
                 delete heightmapTerrainPageSource;
-        delete occlusionPlugin;
+        //delete occlusionDotPlugin;
+                delete occlusionOctreePlugin;
                 delete occlusionTerrainPlugin;
     }