Changeset 675 for GTP/trunk/Lib/Vis/OnlineCullingCHC

Timestamp:

03/06/06 09:17:09 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreOcclusionCullingSceneManager.h (added)
• scripts/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• src/OgreOcclusionCullingSceneManager.cpp (added)
• src/OgreVisibilityTerrainSceneManager.cpp (modified) (26 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -150 +150 @@
                                 Filter="">
                                 <File
+                                        RelativePath="..\include\OgreOcclusionCullingSceneManager.h">
+                                </File>
+                                <File
                                         RelativePath="..\include\OgreOctreeHierarchyInterface.h">
                                 </File>
@@ -167 +170 @@
                                 <File
                                         RelativePath="..\src\OgreBspHierarchyInterface.cpp">
+                                </File>
+                                <File
+                                        RelativePath="..\src\OgreOcclusionCullingSceneManager.cpp">
                                 </File>
                                 <File

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilityTerrainSceneManager.cpp

@@ -1 @@
-#include "OgreVisibilityTerrainSceneManager.h"
+#include "OgreOcclusionCullingSceneManager.h"
 #include "OgreVisibilityOptionsManager.h"
 #include <OgreMath.h>
@@ -14 +14 @@
 
 //-----------------------------------------------------------------------
-VisibilityTerrainSceneManager::VisibilityTerrainSceneManager(
+OcclusionCullingSceneManager::OcclusionCullingSceneManager(
                                                         GtpVisibility::VisibilityManager *visManager): 
 mVisibilityManager(visManager), 
@@ -45 +45 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::InitDepthPass()
+void OcclusionCullingSceneManager::InitDepthPass()
 {
         MaterialPtr depthMat = MaterialManager::getSingleton().getByName("Visibility/DepthPass");
@@ -66 +66 @@
 }
 //-----------------------------------------------------------------------
-VisibilityTerrainSceneManager::~VisibilityTerrainSceneManager()
+OcclusionCullingSceneManager::~OcclusionCullingSceneManager()
 {
         OGRE_DELETE(mHierarchyInterface);
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::InitItemBufferPass()
+void OcclusionCullingSceneManager::InitItemBufferPass()
 {
         MaterialPtr itemBufferMat = MaterialManager::getSingleton().
@@ -95 +95 @@
 }
 //-------------------------------------------------------------------------
-void VisibilityTerrainSceneManager::setWorldGeometry( const String& filename )
+void OcclusionCullingSceneManager::setWorldGeometry( const String& filename )
 {
     // Clear out any existing world resources (if not default)
@@ -124 +124 @@
 
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::PrepareVisualization(Camera *cam)
+void OcclusionCullingSceneManager::PrepareVisualization(Camera *cam)
 {
         // add player camera for visualization purpose
@@ -173 +173 @@
 }
 //-----------------------------------------------------------------------
-Pass *VisibilityTerrainSceneManager::setPass(Pass* pass)
+Pass *OcclusionCullingSceneManager::setPass(Pass* pass)
 {
         // TODO: setting vertex program is not efficient
@@ -236 +236 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::_findVisibleObjects(Camera* cam,
+void OcclusionCullingSceneManager::_findVisibleObjects(Camera* cam,
                                                                                                                 bool onlyShadowCasters)
 {
@@ -266 +266 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::_renderVisibleObjects()
+void OcclusionCullingSceneManager::_renderVisibleObjects()
 {
 
@@ -354 +354 @@
                 if (mUseDepthPass)
                 {
-                        for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
+                        for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++ it)
                         {
                                 (*it)->_addToRenderQueue(mCameraInProgress, getRenderQueue(), false);
@@ -381 +381 @@
 
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::_updateSceneGraph(Camera* cam)
+void OcclusionCullingSceneManager::_updateSceneGraph(Camera* cam)
 {
         mVisibilityManager->GetCullingManager()->SetHierarchyInterface(mHierarchyInterface);
@@ -389 +389 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::setOption(const String & key, const void * val)
+bool OcclusionCullingSceneManager::setOption(const String & key, const void * val)
 {
         if (key == "UseDepthPass")
@@ -482 +482 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::getOption(const String & key, void *val)
+bool OcclusionCullingSceneManager::getOption(const String & key, void *val)
 {
         if (key == "NumHierarchyNodes")
@@ -494 +494 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::getOptionValues(const String & key, 
+bool OcclusionCullingSceneManager::getOptionValues(const String & key, 
                                                                                                         StringVector &refValueList)
 {
@@ -500 +500 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::getOptionKeys(StringVector & refKeys)
+bool OcclusionCullingSceneManager::getOptionKeys(StringVector & refKeys)
 {
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
@@ -506 +506 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::setVisibilityManager(GtpVisibility::
+void OcclusionCullingSceneManager::setVisibilityManager(GtpVisibility::
                                                                                                                  VisibilityManager *visManager)
 {
@@ -512 +512 @@
 }
 //-----------------------------------------------------------------------
-GtpVisibility::VisibilityManager *VisibilityTerrainSceneManager::getVisibilityManager( void )
+GtpVisibility::VisibilityManager *OcclusionCullingSceneManager::getVisibilityManager( void )
 {
         return mVisibilityManager;
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::WriteLog()
+void OcclusionCullingSceneManager::WriteLog()
 {
         std::stringstream d;
@@ -535 +535 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::renderObjects(
+void OcclusionCullingSceneManager::renderObjects(
         const RenderPriorityGroup::TransparentRenderablePassList& objs, 
     bool doLightIteration, const LightList* manualLightList)
@@ -546 +546 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::validatePassForRendering(Pass* pass)
+bool OcclusionCullingSceneManager::validatePassForRendering(Pass* pass)
 {
         // skip all but first pass if we are doing the depth pass
@@ -553 +553 @@
                 return false;
         }
+
         return SceneManager::validatePassForRendering(pass);
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::renderQueueGroupObjects(RenderQueueGroup* pGroup)
+void OcclusionCullingSceneManager::renderQueueGroupObjects(RenderQueueGroup* pGroup)
 {
         if (!mIsItemBufferPhase)
@@ -575 +576 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::RenderItemBuffer(RenderPriorityGroup* pGroup)
+void OcclusionCullingSceneManager::RenderItemBuffer(RenderPriorityGroup* pGroup)
 {
         // Do solids
@@ -632 +633 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::RenderSingleObjectForItemBuffer(Renderable *rend, Pass *pass)
+void OcclusionCullingSceneManager::RenderSingleObjectForItemBuffer(Renderable *rend, Pass *pass)
 {
         static LightList nullLightList;
@@ -677 +678 @@
 }
 //-----------------------------------------------------------------------
-GtpVisibility::VisibilityManager *VisibilityTerrainSceneManager::GetVisibilityManager()
+GtpVisibility::VisibilityManager *OcclusionCullingSceneManager::GetVisibilityManager()
 {
         return mVisibilityManager;
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::InitVisibilityCulling(Camera *cam)
+void OcclusionCullingSceneManager::InitVisibilityCulling(Camera *cam)
 {
         // reset culling manager stats
@@ -742 +743 @@
         // possible two cameras (one for culling, one for rendering)
         mHierarchyInterface->InitTraversal(mCameraInProgress, 
-                                                        mCullCamera ? getCamera("CullCamera") : NULL,
-                                                        mLeavePassesInQueue);
+                                                                           mCullCamera ? getCamera("CullCamera") : NULL,
+                                                                           mLeavePassesInQueue);
                 
         //std::stringstream d; d << "leave passes in queue: " << mLeavePassesInQueue;LogManager::getSingleton().logMessage(d.str());
 }
 //-----------------------------------------------------------------------
-OctreeHierarchyInterface *VisibilityTerrainSceneManager::GetHierarchyInterface()
+OctreeHierarchyInterface *OcclusionCullingSceneManager::GetHierarchyInterface()
 {
         return mHierarchyInterface;
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::endFrame()
+void OcclusionCullingSceneManager::endFrame()
 {
         TerrainRenderable::ResetRenderLevelIndex();
 }
 //-----------------------------------------------------------------------
-Entity* VisibilityTerrainSceneManager::createEntity(const String& entityName, 
+Entity* OcclusionCullingSceneManager::createEntity(const String& entityName, 
                                                                                                         const String& meshName)
 {
@@ -774 +775 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
+void OcclusionCullingSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
 {
         // only render solid passes during hierarchical culling
@@ -806 +807 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
+void OcclusionCullingSceneManager::renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
 {
    if (mIsHierarchicalCulling)