Changeset 897 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilityOctreeSceneManager.cpp

Timestamp:

05/04/06 18:26:23 (19 years ago)

Author:

mattausch

Message:

updated to ogre 1.2

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilityOctreeSceneManager.cpp (modified) (23 diffs)

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

@@ -9 +9 @@
 #include <OgreEntity.h>
 #include <OgreSubEntity.h>
+#include <OgreMaterialManager.h>
 #include <OgreIteratorWrappers.h>
 #include "VspBspTree.h"
@@ -24 +25 @@
 
 //-----------------------------------------------------------------------
-VisibilityOctreeSceneManager::VisibilityOctreeSceneManager(
-        GtpVisibility::VisibilityManager *visManager):
-OctreeSceneManager(),
+VisibilityOctreeSceneManager::VisibilityOctreeSceneManager(const String& name, 
+        GtpVisibility::VisibilityManager *visManager)
+:
+OctreeSceneManager(name),
 mVisibilityManager(visManager), 
 mShowVisualization(false),
@@ -135 +137 @@
     }
         // add bounding boxes of rendered objects
-        if (0)
+        if (1)
         for (BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it)
 {
@@ -159 +161 @@
                                         (*it)->getAttachedObject(0)->isVisible())
                                 {
-                                        getRenderQueue()->addRenderable((*it));
-                                }
+                                getRenderQueue()->addRenderable((*it));
+                        }
                         }
                         // add renderables itself
@@ -171 +173 @@
 }
 //-----------------------------------------------------------------------
-Pass *VisibilityOctreeSceneManager::setPass(Pass* pass)
+const Pass *VisibilityOctreeSceneManager::_setPass(Pass* pass)
 {
         if (NORMAL_RENDER_HACK)
         {
-                return SceneManager::setPass(pass);
+                return SceneManager::_setPass(pass);
         }
 
@@ -230 +232 @@
 
         //-- set actual pass here
-        Pass *result = SceneManager::setPass(usedPass);
+        const Pass *result = SceneManager::_setPass(usedPass);
 
 
@@ -291 +293 @@
         {
                 OctreeSceneManager::_renderVisibleObjects();
-
+        
                 return;
         }
@@ -357 +359 @@
                 // exclude this queues from hierarchical rendering
                 setSpecialCaseRenderQueueMode(SceneManager::SCRQM_EXCLUDE);
+        
 
                 // set all necessary parameters for 
@@ -402 +405 @@
                 //-- used for depth pass, transparents, overlay
                 clearSpecialCaseRenderQueues();
-
+        
+                //-- we render all remaining queue objects
+                // used for depth pass, transparents, overlay 
+                clearSpecialCaseRenderQueues();
                 OctreeSceneManager::_renderVisibleObjects();
         
-        } // hierarchical culling
+        }   // hierarchical culling
 
         // reset ambient light
@@ -535 +541 @@
                 return true;
         }
-
+        
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || OctreeSceneManager::setOption(key, val);
@@ -593 +599 @@
 //-----------------------------------------------------------------------
 void VisibilityOctreeSceneManager::renderObjects(
-        const RenderPriorityGroup::TransparentRenderablePassList& objs, 
+                        const QueuedRenderableCollection& objs, 
+                        QueuedRenderableCollection::OrganisationMode om,
             bool doLightIteration, const LightList* manualLightList)
 {
@@ -600 +607 @@
         if (NORMAL_RENDER_HACK || !mSkipTransparents)
         {
-                OctreeSceneManager::renderObjects(objs, doLightIteration, manualLightList);
+                OctreeSceneManager::renderObjects(objs, om, doLightIteration, manualLightList);
         }
 }
@@ -625 +632 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityOctreeSceneManager::renderQueueGroupObjects(RenderQueueGroup* pGroup)
+void VisibilityOctreeSceneManager::_renderQueueGroupObjects(
+        RenderQueueGroup* pGroup, QueuedRenderableCollection::OrganisationMode om)
 {
         if (NORMAL_RENDER_HACK || !mIsItemBufferPhase)
         {
-                OctreeSceneManager::renderQueueGroupObjects(pGroup);
+                OctreeSceneManager::_renderQueueGroupObjects(pGroup, om);
                 return;
         }
-
-        //-- item buffer: render objects using false colors
+#ifdef ITEM_BUFFER
+        //-- renders item buffer
 
     // Iterate through priorities
@@ -642 +650 @@
                 RenderItemBuffer(groupIt.getNext());
         }
-}
+#endif // ITEM_BUFFER
+}
+#ifdef ITEM_BUFFER
 //-----------------------------------------------------------------------
 void VisibilityOctreeSceneManager::RenderItemBuffer(RenderPriorityGroup* pGroup)
@@ -748 +758 @@
         renderSingleObject(rend, usedPass, false, &nullLightList);
 }
+#endif // ITEM_BUFFER
 //-----------------------------------------------------------------------
 GtpVisibility::VisibilityManager *VisibilityOctreeSceneManager::GetVisibilityManager()
@@ -789 +800 @@
                         mLeavePassesInQueue |= RenderPriorityGroup::TRANSPARENT_PASSES;
 
-                        // just render ambient stuff
-                        mIlluminationStage = IRS_AMBIENT;
+                        // just render ambient passes
+                        /*** msz: no more IRS_AMBIENT, see OgreSceneManager.h ***/
+                        // mIlluminationStage = IRS_AMBIENT;
                         getRenderQueue()->setSplitPassesByLightingType(true);
                 }
@@ -821 +833 @@
                                                         mLeavePassesInQueue);
                 
+        //std::stringstream d; d << "leave passes in queue: " << mLeavePassesInQueue;
+        //LogManager::getSingleton().logMessage(d.str());
 }
 //-----------------------------------------------------------------------
@@ -845 +859 @@
 //-----------------------------------------------------------------------
 void VisibilityOctreeSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(
-        RenderQueueGroup* pGroup)
+        RenderQueueGroup* pGroup, QueuedRenderableCollection::OrganisationMode om)
 {
         // only render solid passes during hierarchical culling
@@ -864 +878 @@
 
                         // Render all the ambient passes first, no light iteration, no lights
-                        mIlluminationStage = IRS_AMBIENT;
-
-                        OctreeSceneManager::renderObjects(pPriorityGrp->_getSolidPasses(), false, &lightList);
+                        /*** msz: no more IRS_AMBIENT, see OgreSceneManager.h ***/
+                        // mIlluminationStage = IRS_AMBIENT;
+
+                        OctreeSceneManager::renderObjects(pPriorityGrp->getSolidsBasic(), om, false, &lightList);
                         // Also render any objects which have receive shadows disabled
-                        OctreeSceneManager::renderObjects(pPriorityGrp->_getSolidPassesNoShadow(), true);
+                        OctreeSceneManager::renderObjects(pPriorityGrp->getSolidsNoShadowReceive(), om, true);          
 #if 0           
                         std::stringstream d; 
@@ -881 +896 @@
         else // render the rest of the passes
         {
-                OctreeSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(pGroup);
-        }
-}
-//-----------------------------------------------------------------------
-void VisibilityOctreeSceneManager::renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
+                OctreeSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(pGroup, om);
+        }
+}
+//-----------------------------------------------------------------------
+void VisibilityOctreeSceneManager::renderModulativeStencilShadowedQueueGroupObjects(
+        RenderQueueGroup* pGroup, QueuedRenderableCollection::OrganisationMode om)
 {
    if (mIsHierarchicalCulling)
@@ -900 +916 @@
 
                    // Do (shadowable) solids
-                   OctreeSceneManager::renderObjects(pPriorityGrp->_getSolidPasses(), true);
+                   OctreeSceneManager::renderObjects(pPriorityGrp->getSolidsBasic(), om, true);
            }
    }
    else
    {
-           SceneManager::renderModulativeStencilShadowedQueueGroupObjects(pGroup);
+           SceneManager::renderModulativeStencilShadowedQueueGroupObjects(pGroup, om);
    }
 }
-
+//-------------------------------------------------------------------------
+void VisibilityOctreeSceneManager::SetObjectsVisible(const bool visible)
+{
+        GtpVisibilityPreprocessor::ObjectContainer::iterator it, it_end = mObjects.end();
+
+        for (it = mObjects.begin(); it != it_end; ++ it)
+        {
+                OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(*it);
+                Entity *ent = omi->GetMesh();
+                ent->setVisible(visible);
+        }
+}
+//-------------------------------------------------------------------------
+void VisibilityOctreeSceneManager::loadVisibilityConfig(const String& filename)
+{
+        // TODO matt
+        // Set up the options
+        ConfigFile config;
+        String val;
+
+        config.load(filename);
+
+        val = config.getSetting("Algorithm");
+
+    if (!val.empty())
+        {
+                 VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).setOption("Algorithm", val.c_str());
+        }
+
+        val = config.getSetting("UseDepthPass");
+
+        if (!val.empty())
+        {
+                 setOption("UseDepthPass", val.c_str());
+        }
+}
+//-------------------------------------------------------------------------
 inline static AxisAlignedBox EnlargeBox(const AxisAlignedBox &box)
 {
@@ -1056 +1108 @@
 }
 //-------------------------------------------------------------------------
-void VisibilityOctreeSceneManager::SetObjectsVisible(const bool visible)
-{
-        // for OGRE 1.2
-//#ifdef OGRE12
-        //MovableObjectIterator mit = getMovableObjectIterator("Entity");
-#if 0
-        EntityIterator eit = getEntityIterator();
-
-        // set all objects to invisible (initially);
-        while (eit.hasMoreElements())
-        {
-                Entity *ent = eit.getNext();
-                ent->setVisible(visible);
-        }
-
-#else
-        GtpVisibilityPreprocessor::ObjectContainer::iterator it, it_end = mObjects.end();
-
-        for (it = mObjects.begin(); it != it_end; ++ it)
-        {
-                OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(*it);
-                Entity *ent = omi->GetMesh();
-                ent->setVisible(visible);
-        }
-#endif
-}
-//-------------------------------------------------------------------------
-void VisibilityOctreeSceneManager::loadVisibilityConfig(const String &filename)
-{
-        // TODO matt
-        // Set up the options
-        ConfigFile config;
-        String val;
-
-        config.load(filename);
-
-        val = config.getSetting("Algorithm");
-
-    if (!val.empty())
-        {
-                 VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).setOption("Algorithm", val.c_str());
-        }
-
-        val = config.getSetting("UseDepthPass");
-
-        if (!val.empty())
-        {
-                 setOption("UseDepthPass", val.c_str());
-        }
-}
-//-------------------------------------------------------------------------
 void VisibilityOctreeSceneManager::updatePvs(Camera *cam)
 {
@@ -1156 +1157 @@
 }
 
+
+
+//-----------------------------------------------------------------------
+const String VisibilityOctreeSceneManagerFactory::FACTORY_TYPE_NAME = "VisibilityOctreeSceneManager";
+//-----------------------------------------------------------------------
+void VisibilityOctreeSceneManagerFactory::initMetaData(void) const
+{
+        mMetaData.typeName = FACTORY_TYPE_NAME;
+        mMetaData.description = "Scene manager organising the scene on the basis of an octree with advanced occlusion culling (TM).";
+        mMetaData.sceneTypeMask = 0xFFFF; // support all types
+        mMetaData.worldGeometrySupported = false;
+}
+//-----------------------------------------------------------------------
+SceneManager* VisibilityOctreeSceneManagerFactory::createInstance(
+        const String& instanceName)
+{
+        return new VisibilityOctreeSceneManager(instanceName, visManager);
+}
+//-----------------------------------------------------------------------
+void VisibilityOctreeSceneManagerFactory::destroyInstance(SceneManager* instance)
+{
+        delete instance;
+}
+
 }  // namespace Ogre