Changeset 99 for trunk/VUT/Ogre/src

Timestamp:

05/15/05 04:08:02 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/Ogre/src

Files:

• OgreVisibilityOctreeSceneManager.cpp (modified) (4 diffs)
• OgreVisibilitySceneManager.cpp (modified) (3 diffs)
• OgreVisibilityTerrainSceneManager.cpp (modified) (6 diffs)

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -12 +12 @@
 VisibilityOctreeSceneManager::VisibilityOctreeSceneManager(
         GtpVisibility::VisibilityManager *visManager)
-: mVisibilityManager(visManager), mUseCulling(true)
+: mVisibilityManager(visManager), mUseVisibilityCulling(true)
 {
         mHierarchyInterface = 
@@ -38 +38 @@
 
         // standard scenemanager rendering without hierarchical culling
-        if(!mUseCulling)
+        if(!mUseVisibilityCulling)
         {       
                 OctreeSceneManager::_renderVisibleObjects();
@@ -76 +76 @@
         SceneManager::_renderVisibleObjects();
 
-        // write out stats
-        WriteLog();
+        //WriteLog(); // write out stats
 }
 //-----------------------------------------------------------------------
 void VisibilityOctreeSceneManager::_findVisibleObjects(Camera* cam, bool onlyShadowCasters)
 {
-        // empty if hierarchical culling is used =>
+        // does nothing if hierarchical culling is used =>
         // we interleave identification and rendering of objects 
         // in _renderVisibibleObjects 
-        if(!mUseCulling)
+        getRenderQueue()->clear();
+    mBoxes.clear();
+    mVisible.clear();
+
+        if(!mUseVisibilityCulling)
         {
                 OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
@@ -104 +107 @@
 bool VisibilityOctreeSceneManager::setOption(const String & key, const void * val)
 {
-        if (key == "UseCulling")
+        if (key == "UseVisibilityCulling")
         {
-                mUseCulling = (*static_cast<const bool *>(val));
+                mUseVisibilityCulling = (*static_cast<const bool *>(val));
                 return true;
         }
-
+        
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || OctreeSceneManager::setOption(key, val);

trunk/VUT/Ogre/src/OgreVisibilitySceneManager.cpp

@@ -12 +12 @@
 //-----------------------------------------------------------------------
 VisibilitySceneManager::VisibilitySceneManager(GtpVisibility::VisibilityManager *visManager)
-:mVisibilityManager(visManager), mUseCulling(true)
+:mVisibilityManager(visManager), mUseVisibilityCulling(true)
 {
         mHierarchyInterface = new SceneNodeHierarchyInterface(this, mDestRenderSystem);
@@ -27 +27 @@
         // we interleave identification and rendering of objects 
         // in _renderVisibibleObjects 
-        if(!mUseCulling)
+        if(!mUseVisibilityCulling)
         {
                 SceneManager::_findVisibleObjects(cam, onlyShadowCasters);
@@ -38 +38 @@
         mVisibilityManager->GetCullingManager()->InitFrame();
 
-        if(!mUseCulling)
+        if(!mUseVisibilityCulling)
         {       
                 SceneManager::_renderVisibleObjects();

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -15 +15 @@
 VisibilityTerrainSceneManager::VisibilityTerrainSceneManager(
         GtpVisibility::VisibilityManager *visManager)
-: mVisibilityManager(visManager), mUseCulling(true)
+: mVisibilityManager(visManager), mUseVisibilityCulling(true),
+mShowVisualization(false)
 {
         mHierarchyInterface = 
@@ -38 +39 @@
         
         // standard scenemanager rendering without hierarchical culling
-        if(!mUseCulling)
+        if(!mUseVisibilityCulling || mShowVisualization)
         {       
                 OctreeSceneManager::_renderVisibleObjects();
@@ -74 +75 @@
         clearSpecialCaseRenderQueues();
         SceneManager::_renderVisibleObjects();
+
+        //WriteLog(); // write out stats
 }
 //-----------------------------------------------------------------------
 void VisibilityTerrainSceneManager::_findVisibleObjects(Camera* cam, bool onlyShadowCasters)
 {
-        // empty if hierarchical culling is used =>
+        // does nothing if hierarchical culling is used =>
         // we interleave identification and rendering of objects 
         // in _renderVisibibleObjects 
-        if(!mUseCulling)
+        if (mShowVisualization)
+    {
+                for ( BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it )
+                {
+                        getRenderQueue()->addRenderable(*it);
+                }
+        }
+
+        getRenderQueue()->clear();
+    mBoxes.clear();
+    mVisible.clear();
+
+        if(!mUseVisibilityCulling)
         {
                 OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
@@ -101 +116 @@
 bool VisibilityTerrainSceneManager::setOption(const String & key, const void * val)
 {
-        if (key == "UseCulling")
+        if (key == "UseVisibilityCulling")
         {
-                mUseCulling = (*static_cast<const bool *>(val));
+                mUseVisibilityCulling = (*static_cast<const bool *>(val));
+                return true;
+        }
+        if (key == "ShowVisualization")
+        {
+                mShowVisualization = (*static_cast<const bool *>(val));
                 return true;
         }
@@ -119 +139 @@
         }
         
+
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 getOption(key, val) && TerrainSceneManager::getOption(key, val);
@@ -144 +165 @@
 }
 //-----------------------------------------------------------------------
+void VisibilityTerrainSceneManager::SetShowVisualization(bool showViz)
+{
+        mShowVisualization = showViz;
+}
+//-----------------------------------------------------------------------
 void VisibilityTerrainSceneManager::WriteLog()
 {