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

Timestamp:

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

Author:

mattausch

Message:

updated to ogre 1.2

File:

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

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

@@ -10 +10 @@
 #include <OgreEntity.h>
 #include <OgreSubEntity.h>
+#include <OgreMaterialManager.h>
 #include <OgreIteratorWrappers.h>
 #include "VspBspTree.h"
@@ -22 +23 @@
 
 //-----------------------------------------------------------------------
-OcclusionCullingSceneManager::OcclusionCullingSceneManager(
-                                                        GtpVisibility::VisibilityManager *visManager): 
-TerrainSceneManager(),
+OcclusionCullingSceneManager::OcclusionCullingSceneManager(const String& name, 
+                                                        GtpVisibility::VisibilityManager *visManager):
+TerrainSceneManager(name),
 mVisibilityManager(visManager), 
 mShowVisualization(false),
@@ -35 +36 @@
 mIsDepthPassPhase(false),
 mUseItemBuffer(false),
+//mUseItemBuffer(true),
 mIsItemBufferPhase(false),
 mCurrentEntityId(1),
@@ -105 +107 @@
         //mItemBufferPass->setAmbient(1, 1, 0);
 }
+//-------------------------------------------------------------------------
+void OcclusionCullingSceneManager::setWorldGeometry( DataStreamPtr& stream, const String& typeName )
+{
+    // Clear out any existing world resources (if not default)
+    if (ResourceGroupManager::getSingleton().getWorldResourceGroupName() != 
+        ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME)
+    {
+        ResourceGroupManager::getSingleton().clearResourceGroup(
+            ResourceGroupManager::getSingleton().getWorldResourceGroupName());
+    }
+        destroyLevelIndexes();
+    mTerrainPages.clear();
+    // Load the configuration
+    loadConfig( stream );
+        initLevelIndexes();
+
+    // Resize the octree, allow for 1 page for now
+    float max_x = mOptions.scale.x * mOptions.pageSize;
+    float max_y = mOptions.scale.y;
+    float max_z = mOptions.scale.z * mOptions.pageSize;
+
+        float maxAxis = std::max(max_x, max_y);
+        maxAxis = std::max(maxAxis, max_z);
+        resize( AxisAlignedBox( 0, 0, 0, maxAxis, maxAxis, maxAxis ) );
+    
+    setupTerrainMaterial();
+
+    setupTerrainPages();
+
+ }
+
 //-----------------------------------------------------------------------
 void OcclusionCullingSceneManager::PrepareVisualization(Camera *cam)
@@ -157 +190 @@
 }
 //-----------------------------------------------------------------------
-Pass *OcclusionCullingSceneManager::setPass(Pass* pass)
+const Pass *OcclusionCullingSceneManager::_setPass(Pass* pass)
 {
         if (NORMAL_RENDER_HACK)
         {
-                return SceneManager::setPass(pass);
+                return SceneManager::_setPass(pass);
         }
 
@@ -217 +250 @@
 
         //-- set actual pass here
-        Pass *result = SceneManager::setPass(usedPass);
+        const Pass *result = SceneManager::_setPass(usedPass);
 
 
@@ -232 +265 @@
 }
 //-----------------------------------------------------------------------
-void OcclusionCullingSceneManager::_findVisibleObjects(Camera* cam, bool onlyShadowCasters)
+void OcclusionCullingSceneManager::_findVisibleObjects(Camera* cam,
+                                                                                                                bool onlyShadowCasters)
 {
         if (NORMAL_RENDER_HACK)
@@ -335 +369 @@
                 addSpecialCaseRenderQueue(RENDER_QUEUE_SKIES_LATE);
                 addSpecialCaseRenderQueue(RENDER_QUEUE_OVERLAY);
-                        
+        
                 // exclude this queues from hierarchical rendering
                 setSpecialCaseRenderQueueMode(SceneManager::SCRQM_EXCLUDE);
@@ -343 +377 @@
                 InitVisibilityCulling(mCameraInProgress);
 
-        
+
                 /** 
                 * the hierarchical culling algorithm
@@ -366 +400 @@
                 
                 mLeavePassesInQueue = 0;
-
+                
 #if 1   
                 // add visible nodes found by the visibility culling algorithm
@@ -495 +529 @@
                 if (useArbQueries)
                 {
-                        mHierarchyInterface->DeleteQueries();
+                        mHierarchyInterface->ResetQueries();
                         mDestRenderSystem->setConfigOption("ArbQueries", "Yes");
                 }
                 else
                 {
-                        mHierarchyInterface->DeleteQueries();
+                        mHierarchyInterface->ResetQueries();
                         mDestRenderSystem->setConfigOption("ArbQueries", "No");
                 }
         }
-
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || TerrainSceneManager::setOption(key, val);
@@ -564 +597 @@
 //-----------------------------------------------------------------------
 void OcclusionCullingSceneManager::renderObjects(
-        const RenderPriorityGroup::TransparentRenderablePassList& objs, 
+        const QueuedRenderableCollection& objs,
+        QueuedRenderableCollection::OrganisationMode om,
     bool doLightIteration, const LightList* manualLightList)
 {
@@ -571 +605 @@
         if (NORMAL_RENDER_HACK || !mSkipTransparents)
         {
-                OctreeSceneManager::renderObjects(objs, doLightIteration, manualLightList);
+                OctreeSceneManager::renderObjects(objs, om, doLightIteration, manualLightList);
         }
 }
@@ -596 +630 @@
 }
 //-----------------------------------------------------------------------
-void OcclusionCullingSceneManager::renderQueueGroupObjects(RenderQueueGroup* pGroup)
+void OcclusionCullingSceneManager::_renderQueueGroupObjects(RenderQueueGroup* pGroup,
+                                                                                                                        QueuedRenderableCollection::OrganisationMode om)
 {
         if (NORMAL_RENDER_HACK || !mIsItemBufferPhase)
         {
-                TerrainSceneManager::renderQueueGroupObjects(pGroup);
+                TerrainSceneManager::_renderQueueGroupObjects(pGroup, om);
                 return;
         }
-
+#ifdef  ITEM_BUFFER
+        //-- item buffer
         //-- item buffer: render objects using false colors
 
@@ -613 +649 @@
                 RenderItemBuffer(groupIt.getNext());
         }
-}
+#endif // ITEM_BUFFER
+}
+#ifdef ITEM_BUFFER
 //-----------------------------------------------------------------------
 void OcclusionCullingSceneManager::RenderItemBuffer(RenderPriorityGroup* pGroup)
 {
         // Do solids
-        RenderPriorityGroup::SolidRenderablePassMap solidObjs = pGroup->_getSolidPasses();
+        QueuedRenderableCollection solidObjs = pGroup->getSolidsBasic();//msz
 
         // ----- SOLIDS LOOP -----
@@ -658 +696 @@
         if (mRenderTransparentsForItemBuffer)
         {
-                RenderPriorityGroup::TransparentRenderablePassList transpObjs = 
-                        pGroup->_getTransparentPasses();
+                QueuedRenderableCollection transpObjs = pGroup->getTransparents(); //msz
                 RenderPriorityGroup::TransparentRenderablePassList::const_iterator 
                         itrans, itransend;
@@ -713 +750 @@
         }
 
-        Pass *usedPass = setPass(mItemBufferPass); 
+        const Pass *usedPass = _setPass(mItemBufferPass); 
 
 
@@ -719 +756 @@
         renderSingleObject(rend, usedPass, false, &nullLightList);
 }
+#endif // ITEM_BUFFER
 //-----------------------------------------------------------------------
 GtpVisibility::VisibilityManager *OcclusionCullingSceneManager::GetVisibilityManager()
@@ -749 +787 @@
         mLeavePassesInQueue = 0;
 
-        if (!mUseDepthPass && !mUseItemBuffer)
+        // if we have the depth pass or use an item buffer, no passes are left in the queue
+        if (1 && !mUseDepthPass && !mUseItemBuffer)
         {
                 if (mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
@@ -761 +800 @@
 
                         // just render ambient stuff
-                        mIlluminationStage = IRS_AMBIENT;
-                        getRenderQueue()->setSplitPassesByLightingType(true);
+                        /*** msz: no more IRS_AMBIENT, see OgreSceneManager.h ***/
+                        // mIlluminationStage = IRS_AMBIENT; 
                 }
         
@@ -820 +859 @@
 }
 //-----------------------------------------------------------------------
-void OcclusionCullingSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
+void OcclusionCullingSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(
+        RenderQueueGroup* pGroup, QueuedRenderableCollection::OrganisationMode om)
 {
         // only render solid passes during hierarchical culling
@@ -839 +879 @@
 
                         // 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);
                 }
         }
         else
         {
-                OctreeSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(pGroup);
-        }
-}
-//-----------------------------------------------------------------------
-void OcclusionCullingSceneManager::renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
+                OctreeSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(pGroup, om);
+        }
+}
+//-----------------------------------------------------------------------
+void OcclusionCullingSceneManager::renderModulativeStencilShadowedQueueGroupObjects(
+        RenderQueueGroup* pGroup, QueuedRenderableCollection::OrganisationMode om)
 {
    if (mIsHierarchicalCulling)
@@ -867 +909 @@
 
                    // Do (shadowable) solids
-                   OctreeSceneManager::renderObjects(pPriorityGrp->_getSolidPasses(), true);
+                   OctreeSceneManager::renderObjects(pPriorityGrp->getSolidsBasic(), om, true);
            }
    }
    else
    {
-           SceneManager::renderModulativeStencilShadowedQueueGroupObjects(pGroup);
+           SceneManager::renderModulativeStencilShadowedQueueGroupObjects(pGroup, om);
    }
-}
-//-------------------------------------------------------------------------
-void OcclusionCullingSceneManager::setWorldGeometry( const String& filename )
-{
-    // Clear out any existing world resources (if not default)
-    if (ResourceGroupManager::getSingleton().getWorldResourceGroupName() != 
-        ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME)
-    {
-        ResourceGroupManager::getSingleton().clearResourceGroup(
-            ResourceGroupManager::getSingleton().getWorldResourceGroupName());
-    }
-    mTerrainPages.clear();
-    // Load the configuration
-    loadConfig(filename);
-
-    // Resize the octree, allow for 1 page for now
-    float max_x = mOptions.scale.x * mOptions.pageSize;
-    float max_y = mOptions.scale.y;
-    float max_z = mOptions.scale.z * mOptions.pageSize;
-
-        float maxAxis = std::max(max_x, max_y);
-        maxAxis = std::max(maxAxis, max_z);
-        resize( AxisAlignedBox( 0, 0, 0, maxAxis, maxAxis, maxAxis ) );
-    
-    setupTerrainMaterial();
-    setupTerrainPages();
 }