Changeset 925 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilityTerrainSceneManager.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/OgreVisibilityTerrainSceneManager.cpp (modified) (4 diffs)

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

@@ -341 +341 @@
                 setSpecialCaseRenderQueueMode(SceneManager::SCRQM_EXCLUDE);
 
+
                 // set all necessary parameters for 
                 // hierarchical visibility culling and rendering
                 InitVisibilityCulling(mCameraInProgress);
+
 
                 /** 
@@ -389 +391 @@
         // HACK: set the new render level index, important to avoid cracks
         // in terrain caused by LOD
-        TerrainRenderable::NextRenderLevelIndex();
+        //TerrainRenderable::NextRenderLevelIndex();
         
         // reset ambient light
@@ -395 +397 @@
 
         getRenderQueue()->clear(); // finally clear render queue
-        if (0) OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
+        if (1) OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
 
         if (0) WriteLog(); // write out stats
@@ -547 +549 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::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)
-        {
-                SceneManager::renderObjects(objs, om, doLightIteration, manualLightList);
-        }
+//-----------------------------------------------------------------------
+void VisibilityTerrainSceneManager::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
 }
 //-----------------------------------------------------------------------