Changeset 103 for trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

Timestamp:

05/18/05 02:06:32 (19 years ago)

Author:

mattausch

Message:

fixed bug with shadow maps

File:

• trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (8 diffs)

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -16 +16 @@
 VisibilityTerrainSceneManager::VisibilityTerrainSceneManager(
         GtpVisibility::VisibilityManager *visManager)
-: mVisibilityManager(visManager), mUseVisibilityCulling(true),
-mShowVisualization(false)
+: mVisibilityManager(visManager), 
+mUseVisibilityCulling(true),
+mShowVisualization(false),
+mRenderNodesForViz(false)
 {
         mHierarchyInterface = 
@@ -24 +26 @@
         //mDisplayNodes = true;
         //mShowBoundingBoxes = true;
+
+        // TODO: set maxdepth to reasonable value
         mMaxDepth = 50;
 }
@@ -32 +36 @@
 }
 //-----------------------------------------------------------------------
+void VisibilityTerrainSceneManager::_findVisibleObjects(Camera* cam, bool onlyShadowCasters)
+{
+        mHierarchyInterface->SetOnlyShadowCasters(onlyShadowCasters);
+        // does nothing if hierarchical culling is used =>
+        // we interleave identification and rendering of objects 
+        // in _renderVisibibleObjects
+        if (!mUseVisibilityCulling)
+        {
+                OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
+                return; 
+        }
+
+        //-- show visibile scene nodes and octree bounding boxes from last frame
+        if (mShowVisualization)
+    {
+                // add player camera for visualization purpose
+                Camera *c;
+                if ((c = getCamera("PlayerCam")) != NULL)
+                {
+                        getRenderQueue()->addRenderable(c);
+                }
+                
+                for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
+                {
+                        getRenderQueue()->addRenderable(*it);
+
+                        if (mRenderNodesForViz)
+                        {
+                                (*it)->_addToRenderQueue(cam, getRenderQueue(), false);
+                        }
+                }
+                for (BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it)
+                {
+                        getRenderQueue()->addRenderable(*it);
+                }
+        }
+        
+        mVisible.clear();
+    mBoxes.clear();
+}
+//-----------------------------------------------------------------------
 void VisibilityTerrainSceneManager::_renderVisibleObjects()
 {
-        // two cameras (one for culling, one for rendering)
-        mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, 
-                                                        mCullCamera ? getCamera("CullCamera") : NULL);
-        //mVisibilityManager->GetCullingManager()->InitFrame();
-        
+        if (!mShowVisualization)
+        {
+                // two cameras (one for culling, one for rendering)
+                mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, 
+                                                                mCullCamera ? getCamera("CullCamera") : NULL);
+
+                // call initframe to reset culling manager stats
+                mVisibilityManager->GetCullingManager()->InitFrame();
+        }
+
         // standard terrain scenemanager rendering without hierarchical culling
-        if(!mUseVisibilityCulling || mShowVisualization)
+        if (!mUseVisibilityCulling || mShowVisualization)
         {       
                 TerrainSceneManager::_renderVisibleObjects();
@@ -85 +135 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::_findVisibleObjects(Camera* cam, bool onlyShadowCasters)
-{
-        // does nothing if hierarchical culling is used =>
-        // we interleave identification and rendering of objects 
-        // in _renderVisibibleObjects
-        getRenderQueue()->clear();
-        
-        if (!mUseVisibilityCulling)
-        {
-                OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
-                return; 
-        }
-        
-        //-- show visibile scene nodes and octree bounding boxes from last frame
-        if (mShowVisualization)
-    {
-                // 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);
-                }
-                for (BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it)
-                {
-                        getRenderQueue()->addRenderable(*it);
-                }
-        }
-        
-        mVisible.clear();
-    mBoxes.clear();
-}
-//-----------------------------------------------------------------------
 void VisibilityTerrainSceneManager::_updateSceneGraph(Camera* cam)
 {
-        // mHierarchyInterface->setNumSceneNodes((int)mSceneNodes.size());
         mVisibilityManager->GetCullingManager()->SetHierarchyInterface(mHierarchyInterface);
         mHierarchyInterface->SetRenderSystem(mDestRenderSystem);
@@ -149 +158 @@
                 return true;
         }
+        if (key == "RenderNodesForViz")
+        {
+                mRenderNodesForViz = (*static_cast<const bool *>(val));
+                return true;
+        }
         if (key == "SkyBoxEnabled")
         {
@@ -180 +194 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::getOptionValues(const String & key, StringVector  &refValueList)
+bool VisibilityTerrainSceneManager::getOptionValues(const String & key, StringVector &refValueList)
 {
         return TerrainSceneManager::getOptionValues( key, refValueList);
@@ -200 +214 @@
         return mVisibilityManager;
 }
-//-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::SetShowVisualization(bool showViz)
-{
-        mShowVisualization = showViz;
-}
-/*
-//-----------------------------------------------------------------------
-void SetSkyBoxEnabled(bool enabled)
-{
-        mSkyBoxEnabled = enabled;
-}
-//-----------------------------------------------------------------------
-void SetSkyPlaneEnabled(bool enabled)
-{
-        mSkyPlaneEnabled = enabled;
-}
-//-----------------------------------------------------------------------
-void SetSkyDomeEnabled(bool enabled)
-{
-        mSkyDomeEnabled = enabled;
-} */
+
 //-----------------------------------------------------------------------
 void VisibilityTerrainSceneManager::WriteLog()
@@ -236 +230 @@
         LogManager::getSingleton().logMessage(d.str());
 }
+
+
 } // namespace Ogre