Changeset 100 for trunk/VUT/Ogre/src

Timestamp:

05/16/05 20:22:32 (20 years ago)

Author:

mattausch

Message:

added visualization for octree culling
camera in terrainexample is now attached to camera node => can see correct camera
in visualization

Location:

trunk/VUT/Ogre/src

Files:

• OgrePlatformHierarchyInterface.cpp (modified) (5 diffs)
• OgreSceneNodeHierarchyInterface.cpp (modified) (2 diffs)
• OgreSolidBoundingBox.cpp (modified) (1 diff)
• OgreSolidHalfBoundingBox.cpp (modified) (2 diffs)
• OgreVisibilityOctreeSceneManager.cpp (modified) (5 diffs)
• OgreVisibilityOptionsManager.cpp (modified) (4 diffs)
• OgreVisibilitySceneManager.cpp (modified) (2 diffs)
• OgreVisibilitySceneManagerDll.cpp (modified) (1 diff)
• OgreVisibilityTerrainSceneManager.cpp (modified) (8 diffs)

trunk/VUT/Ogre/src/OgrePlatformHierarchyInterface.cpp

@@ -20 +20 @@
         DeleteQueries();
 
-        if(mSolidBoundingBox)
+        if (mSolidBoundingBox)
                 delete mSolidBoundingBox;
 }
@@ -26 +26 @@
 void PlatformHierarchyInterface::DeleteQueries()
 {
-        for(int i=0; i < (int)mOcclusionQueries.size(); ++i)
+        for (int i=0; i < (int)mOcclusionQueries.size(); ++i)
                 delete mOcclusionQueries[i];
 
@@ -72 +72 @@
 GtpVisibility::OcclusionQuery *PlatformHierarchyInterface::GetNextOcclusionQuery()
 {
-        if(mCurrentTestIdx == mOcclusionQueries.size())
+        if (mCurrentTestIdx == mOcclusionQueries.size())
         {
                 mOcclusionQueries.push_back(new PlatformOcclusionQuery(mRenderSystem));
@@ -87 +87 @@
         SetCamera(cam);
 
-        if(cullCam)
+        if (cullCam)
                 SetCullCamera(cullCam);
         else
@@ -143 +143 @@
 SolidBoundingBox *PlatformHierarchyInterface::GetSolidBoundingBox()
 {
-        if(!mSolidBoundingBox)
+        if (!mSolidBoundingBox)
                 mSolidBoundingBox = new SolidBoundingBox;
 

trunk/VUT/Ogre/src/OgreSceneNodeHierarchyInterface.cpp

@@ -62 +62 @@
         SceneNode *sceneNode = static_cast<SceneNode *>(node);
 
-        while(sceneNode && !sceneNode->isNodeVisible())
+        while (sceneNode && !sceneNode->isNodeVisible())
         {
                 sceneNode->setNodeVisible(true);
@@ -115 +115 @@
 AxisAlignedBox *SceneNodeHierarchyInterface::GetBoundingBox(GtpVisibility::HierarchyNode *node)
 {
-        if(node != mPreviousNode)
+        if (node != mPreviousNode)
         {
                 mPreviousNode = node;
-
                 mBox = static_cast<SceneNode *>(node)->_getWorldAABB();
         }

trunk/VUT/Ogre/src/OgreSolidBoundingBox.cpp

@@ -121 +121 @@
         m_pMaterial = MaterialManager::getSingleton().getByName("QueryMaterial");
 
-        if(m_pMaterial.isNull())
+        if (m_pMaterial.isNull())
         {
                 m_pMaterial = MaterialManager::getSingleton().

trunk/VUT/Ogre/src/OgreSolidHalfBoundingBox.cpp

@@ -42 +42 @@
 
         // fan 1
-        if(isFirstHalf)
+        if (isFirstHalf)
         {
                 *pPos++ = min.x; *pPos++ = max.y; *pPos++ = max.z; //011
@@ -89 +89 @@
         m_pMaterial = MaterialManager::getSingleton().getByName("QueryMaterial");
 
-        if(m_pMaterial.isNull())
+        if (m_pMaterial.isNull())
         {
                 m_pMaterial = MaterialManager::getSingleton().

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -12 +12 @@
 VisibilityOctreeSceneManager::VisibilityOctreeSceneManager(
         GtpVisibility::VisibilityManager *visManager)
-: mVisibilityManager(visManager), mUseVisibilityCulling(true)
+: mVisibilityManager(visManager), mUseVisibilityCulling(true),
+mShowVisualization(false)
 {
         mHierarchyInterface = 
@@ -35 +36 @@
         mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, 
                                                         mCullCamera ? getCamera("CullCamera") : NULL);
-        mVisibilityManager->GetCullingManager()->InitFrame();
+        //mVisibilityManager->GetCullingManager()->InitFrame();
 
         // standard scenemanager rendering without hierarchical culling
@@ -65 +66 @@
         setSpecialCaseRenderQueueMode(SceneManager::SCRQM_EXCLUDE);
 
-        //-- the hierarchical culling algorithm
+
+        /** 
+        * the hierarchical culling algorithm
+        **/
         mVisibilityManager->ApplyVisibilityCulling();
+
 
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
@@ -84 +89 @@
         // we interleave identification and rendering of objects 
         // in _renderVisibibleObjects 
+        if (!mUseVisibilityCulling)
+        {
+                OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
+                return; 
+        }
+        
+        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);
-        }
 }
 //-----------------------------------------------------------------------
@@ -112 +127 @@
                 return true;
         }
-        
+        if (key == "ShowVisualization")
+        {
+                mShowVisualization = (*static_cast<const bool *>(val));
+                return true;
+        }
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || OctreeSceneManager::setOption(key, val);

trunk/VUT/Ogre/src/OgreVisibilityOptionsManager.cpp

@@ -3 +3 @@
 namespace Ogre {
 //-----------------------------------------------------------------------
-VisibilityOptionsManager::VisibilityOptionsManager(GtpVisibility::VisibilityManager *visManager, 
-                                                                                GtpVisibility::HierarchyInterface *hierarchyInterface):
-mVisibilityManager(visManager), mHierarchyInterface(hierarchyInterface)
+VisibilityOptionsManager::VisibilityOptionsManager(
+        GtpVisibility::VisibilityManager *visManager, 
+        GtpVisibility::HierarchyInterface *hierarchyInterface):
+mVisibilityManager(visManager), 
+mHierarchyInterface(hierarchyInterface)
 {
 }
@@ -11 +13 @@
 bool VisibilityOptionsManager::setOption( const String & key, const void * val )
 {
-        if( key == "Algorithm" )
+        if (key == "Algorithm")
         {
                 mVisibilityManager->SetCullingManager(*static_cast<const 
@@ -17 +19 @@
                 return true;
         }
-        if(key == "Threshold")
+        if (key == "Threshold")
         {
                 mVisibilityManager->SetVisibilityCullingThreshold(*static_cast<const int *>(val));
@@ -67 +69 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityOptionsManager::getOptionKeys( StringVector & refKeys )
+bool VisibilityOptionsManager::getOptionKeys(StringVector & refKeys)
 {
-        refKeys.push_back( "NumRenderedNodes" );
-        refKeys.push_back( "NumTraversedNodes" );
-        refKeys.push_back( "NumQueryCulledNodes" );
-        refKeys.push_back( "NumFrustumCulledNodes" );
+        refKeys.push_back("NumRenderedNodes");
+        refKeys.push_back("NumTraversedNodes");
+        refKeys.push_back("NumQueryCulledNodes");
+        refKeys.push_back("NumFrustumCulledNodes");
         
         return true;

trunk/VUT/Ogre/src/OgreVisibilitySceneManager.cpp

@@ -27 +27 @@
         // we interleave identification and rendering of objects 
         // in _renderVisibibleObjects 
-        if(!mUseVisibilityCulling)
+        if (!mUseVisibilityCulling)
         {
                 SceneManager::_findVisibleObjects(cam, onlyShadowCasters);
@@ -38 +38 @@
         mVisibilityManager->GetCullingManager()->InitFrame();
 
-        if(!mUseVisibilityCulling)
+        if (!mUseVisibilityCulling)
         {       
                 SceneManager::_renderVisibleObjects();

trunk/VUT/Ogre/src/OgreVisibilitySceneManagerDll.cpp

@@ -28 +28 @@
 //#include <OgreVisibilityDotSceneManager.h>
 #include <OgreHeightmapTerrainPageSource.h>
+#include <OgreRoot.h>
+
 #include "VisibilityManager.h"
 #include "StopAndWaitCullingManager.h"
 #include "VisibilityEnvironment.h"
-
-#include <OgreRoot.h>
 
 GtpVisibility::VisibilityEnvironment *visEnv;

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -7 +7 @@
 #include <OgreCamera.h>
 #include <OgreLogManager.h>
+#include <OgreStringConverter.h>
 
 #include <windows.h>
@@ -36 +37 @@
         mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, 
                                                         mCullCamera ? getCamera("CullCamera") : NULL);
-        mVisibilityManager->GetCullingManager()->InitFrame();
+        //mVisibilityManager->GetCullingManager()->InitFrame();
         
         // standard scenemanager rendering without hierarchical culling
@@ -56 +57 @@
         setSpecialCaseRenderQueueMode(SceneManager::SCRQM_INCLUDE);
         SceneManager::_renderVisibleObjects();
+
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
         _deleteRenderedQueueGroups();
@@ -65 +67 @@
         setSpecialCaseRenderQueueMode(SceneManager::SCRQM_EXCLUDE);
 
-        //-- the hierarchical culling algorithm
+
+        /** 
+        * the hierarchical culling algorithm
+        **/
         mVisibilityManager->ApplyVisibilityCulling();
+
 
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
@@ -83 +89 @@
         // does nothing if hierarchical culling is used =>
         // we interleave identification and rendering of objects 
-        // in _renderVisibibleObjects 
+        // in _renderVisibibleObjects
+        getRenderQueue()->clear();
+        
+        if (!mUseVisibilityCulling)
+        {
+                OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
+                return; 
+        }
+        
+        //-- show visibile scene nodes and octree bounding boxes from last frame
         if (mShowVisualization)
     {
-                for ( BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it )
+                // add cull camera for visualization purpose
+                if (mCullCamera)
+                {
+                        Camera *c;
+                        if ((c = getCamera("CullCamera")) != NULL)
+                        {
+                                getRenderQueue()->addRenderable(c);
+                        }
+                }
+
+                for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
                 {
                         getRenderQueue()->addRenderable(*it);
                 }
-        }
-
-        getRenderQueue()->clear();
+                for (BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it)
+                {
+                        getRenderQueue()->addRenderable(*it);
+                }
+        }
+        
+        mVisible.clear();
     mBoxes.clear();
-    mVisible.clear();
-
-        if(!mUseVisibilityCulling)
-        {
-                OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
-        }
 }
 //-----------------------------------------------------------------------
@@ -126 +149 @@
                 return true;
         }
-
+        if (key == "SkyBoxEnabled")
+        {
+                mSkyBoxEnabled = (*static_cast<const bool *>(val));
+                return true;
+        }
+        if (key == "SkyPlaneEnabled")
+        {
+                mSkyPlaneEnabled = (*static_cast<const bool *>(val));
+                return true;
+        }
+        if (key == "SkyDomeEnabled")
+        {
+                mSkyDomeEnabled = (*static_cast<const bool *>(val));
+                return true;
+        }
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || TerrainSceneManager::setOption(key, val);
@@ -139 +176 @@
         }
         
-
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 getOption(key, val) && TerrainSceneManager::getOption(key, val);
@@ -169 +205 @@
         mShowVisualization = showViz;
 }
+/*
+//-----------------------------------------------------------------------
+void SetSkyBoxEnabled(bool enabled)
+{
+        mSkyBoxEnabled = enabled;
+}
+//-----------------------------------------------------------------------
+void SetSkyPlaneEnabled(bool enabled)
+{
+        mSkyPlaneEnabled = enabled;
+}
+//-----------------------------------------------------------------------
+void SetSkyDomeEnabled(bool enabled)
+{
+        mSkyDomeEnabled = enabled;
+} */
 //-----------------------------------------------------------------------
 void VisibilityTerrainSceneManager::WriteLog()