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

Timestamp:

05/08/06 06:55:17 (18 years ago)

Author:

mattausch

Message:

update for ogre 1.2
OcclusionCullingSceneManager? is the only scenemanager in the solution now

File:

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

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

@@ -11 +11 @@
 #include <OgreMaterialManager.h>
 #include <OgreIteratorWrappers.h>
+#include <OgreHeightmapTerrainPageSource.h>
 #include "VspBspTree.h"
 #include "Containers.h"
@@ -44 +45 @@
 mSkipTransparents(false),
 mRenderTransparentsForItemBuffer(true),
-mExecuteVertexProgramForAllPasses(true),
+//mExecuteVertexProgramForAllPasses(true),
+mExecuteVertexProgramForAllPasses(false),
 mIsHierarchicalCulling(false),
 mViewCellsLoaded(false),
@@ -56 +58 @@
         if (0)
         {
-        mDisplayNodes = true;
-        mShowBoundingBoxes = true;
-        mShowBoxes = true;
+                mDisplayNodes = true;
+                mShowBoundingBoxes = true;
+                mShowBoxes = true;
         }
 
         // TODO: set maxdepth to reasonable value
         mMaxDepth = 50;
+
+        //loadVisibilityConfig("GtpVisibility.cfg");
+        //LoadViewCells("");
+        //mViewCellsLoaded = true;
 }
 //-----------------------------------------------------------------------
@@ -117 +123 @@
 }
 //-------------------------------------------------------------------------
+#if 1
 void OcclusionCullingSceneManager::setWorldGeometry( DataStreamPtr& stream, const String& typeName )
 {
@@ -146 +153 @@
 
  }
-
+#endif
 //-----------------------------------------------------------------------
 void OcclusionCullingSceneManager::PrepareVisualization(Camera *cam)
@@ -183 +190 @@
                         {
                                 // render the leaf nodes
-                                if (((*it)->numAttachedObjects() > 0) && ((*it)->numChildren() == 0) && 
-                                         (*it)->getAttachedObject(0)->getMovableType() == "Entity")
+                                if ((*it)->numAttachedObjects() && 
+                                        !(*it)->numChildren() && 
+                                        ((*it)->getAttachedObject(0)->getMovableType() == "Entity") &&
+                                        (*it)->getAttachedObject(0)->isVisible())
                                 {
                                         getRenderQueue()->addRenderable((*it));
@@ -217 +226 @@
         Pass *usedPass = useDepthPass ? mDepthPass : pass;
                 
-        IlluminationRenderStage savedStage = mIlluminationStage; 
+
+        const IlluminationRenderStage savedStage = mIlluminationStage; 
         
         // set illumination stage to NONE so no shadow material is used 
@@ -583 +593 @@
                 return true;
         }
-        
+        if (key == "VisibilityManager")
+        {
+                * static_cast<GtpVisibility::VisibilityManager **>(val) = 
+                        (GtpVisibility::VisibilityManager *)mVisibilityManager;
+                return true;
+        }
+        if (key == "HierarchInterface")
+        {
+                * static_cast<GtpVisibility::HierarchyInterface **>(val) = 
+                        (GtpVisibility::HierarchyInterface *)mHierarchyInterface;
+                return true;
+        }
+
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 getOption(key, val) && TerrainSceneManager::getOption(key, val);
@@ -630 +652 @@
 }
 //-----------------------------------------------------------------------
-void OcclusionCullingSceneManager::renderObjects(
-        const QueuedRenderableCollection& objs,
-        QueuedRenderableCollection::OrganisationMode om,
-    bool doLightIteration, const LightList* manualLightList)
-{
-        // for correct rendering, transparents must be rendered after hierarchical culling
-        // => do nothing
-        if (NORMAL_RENDER_HACK || !mSkipTransparents)
-        {
-                OctreeSceneManager::renderObjects(objs, om, doLightIteration, manualLightList);
-        }
-}
+void OcclusionCullingSceneManager::renderBasicQueueGroupObjects(RenderQueueGroup* pGroup, 
+                                                                                                                                QueuedRenderableCollection::OrganisationMode om)
+{
+    // Basic render loop
+    // Iterate through priorities
+    RenderQueueGroup::PriorityMapIterator groupIt = pGroup->getIterator();
+
+    while (groupIt.hasMoreElements())
+    {
+        RenderPriorityGroup* pPriorityGrp = groupIt.getNext();
+
+        // Sort the queue first
+        pPriorityGrp->sort(mCameraInProgress);
+
+        // Do solids
+        renderObjects(pPriorityGrp->getSolidsBasic(), om, true);
+
+                // for correct rendering, transparents must be rendered after hierarchical culling
+                // => do nothing
+
+        // Do transparents (always descending)
+                if (NORMAL_RENDER_HACK || !mSkipTransparents)
+                {
+                        renderObjects(pPriorityGrp->getTransparents(), 
+                        QueuedRenderableCollection::OM_SORT_DESCENDING, true);
+                }
+
+
+    }// for each priority
+}
+
 //-----------------------------------------------------------------------
 bool OcclusionCullingSceneManager::validatePassForRendering(Pass* pass)
@@ -836 +877 @@
                         /*** msz: no more IRS_AMBIENT, see OgreSceneManager.h ***/
                         // mIlluminationStage = IRS_AMBIENT; 
-                        getRenderQueue()->setSplitPassesByLightingType(true);
+                        //getRenderQueue()->setSplitPassesByLightingType(true);
                 }
         
@@ -1173 +1214 @@
                         //-- compute new filtered cell
                         GtpVisibilityPreprocessor::PrVs prvs;
-                        mViewCellsManager->GetPrVS(viewPoint, prvs);
+                        mViewCellsManager->GetPrVS(viewPoint, prvs, 5);
                         viewCell = prvs.mViewCell;
                 }
@@ -1206 +1247 @@
 }
 //-----------------------------------------------------------------------
-SceneManager* OcclusionCullingSceneManagerFactory::createInstance(
-        const String& instanceName)
-{
-        return new OcclusionCullingSceneManager(instanceName, visManager);
+SceneManager *OcclusionCullingSceneManagerFactory::createInstance(
+                const String& instanceName)
+{
+        OcclusionCullingSceneManager* tsm = new OcclusionCullingSceneManager(instanceName, visManager);
+        
+        // Create & register default sources (one per manager)
+        HeightmapTerrainPageSource* ps = new HeightmapTerrainPageSource();
+        mTerrainPageSources.push_back(ps);
+        tsm->registerPageSource("Heightmap", ps);
+
+        return tsm;
 }
 //-----------------------------------------------------------------------