Changeset 153 for trunk/VUT/Ogre/src

Timestamp:

07/04/05 03:15:53 (19 years ago)

Author:

mattausch

Message:

added item buffer queries

Location:

trunk/VUT/Ogre/src

Files:

• OgreItemBufferQueryManager.cpp (added)
• OgrePlatformQueryManager.cpp (modified) (4 diffs)
• OgreVisibilityTerrainSceneManager.cpp (modified) (17 diffs)

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -37 +37 @@
         bool overlayEnabled = mViewport->getOverlaysEnabled();
         mViewport->setOverlaysEnabled(false);
+
+        //-- render the scene once to update depth buffer
         pfHierarchyInterface->GetSceneManager()->_renderScene(pCam, mViewport, false);
 
@@ -234 +236 @@
         mViewport->setCamera(savedCam);
 
-        // --- remove duplicates (happens if an object is on the edge of the viewport)
+        // --- remove duplicates (duplicates occur if an object is on the edge of the viewport)
 
         // before duplicates can be deleted we have to add up their visibility
@@ -259 +261 @@
         }
         
-        // really delete duplicates
+        // physically delete duplicates
         visibleNodes->erase( std::unique(visibleNodes->begin(), 
                 visibleNodes->end(), nodeinfo_eq), visibleNodes->end());
@@ -284 +286 @@
         }
 
-        // really delete duplicates
+        // physically delete duplicates
         visibleGeometry->erase(std::unique(visibleGeometry->begin(), visibleGeometry->end(), 
                 meshinfo_eq), visibleGeometry->end());

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -13 +13 @@
 
 //-----------------------------------------------------------------------
-VisibilityTerrainSceneManager::VisibilityTerrainSceneManager(
-        GtpVisibility::VisibilityManager *visManager): 
+VisibilityTerrainSceneManager::VisibilityTerrainSceneManager(GtpVisibility::
+                                                                                                                         VisibilityManager *visManager): 
 mVisibilityManager(visManager), 
-mRenderDepthPass(false),
 mShowVisualization(false),
 mRenderNodesForViz(false),
@@ -24 +23 @@
 mDelayRenderTransparents(true),
 mUseDepthPass(false),
-mRenderItemBuffer(true),
+mRenderDepthPass(false),
+//mUseItemBuffer(false),
+mUseItemBuffer(true),
+mRenderItemBuffer(false),
 mCurrentEntityId(0),
 mEnableDepthWrite(true),
@@ -31 +33 @@
 {
         mHierarchyInterface = new OctreeHierarchyInterface(this, mDestRenderSystem);
-        mQueryManager = new PlatformQueryManager(mHierarchyInterface, mCurrentViewport);
-
-        mVisibilityManager->SetQueryManager(mQueryManager);
         
         //mDisplayNodes = true;
@@ -94 +93 @@
                 mHierarchyInterface = NULL;
         }
-        if (mQueryManager)
-        {
-                delete mQueryManager;
-                mQueryManager = NULL;
-        }
 }
 //-----------------------------------------------------------------------
@@ -259 +253 @@
                 mIlluminationStage = savedStage;
         }
-        else // the hierarchical culling algorithm
-        {
-                //-- hierarchical culling
+        else // -- the hierarchical culling algorithm
+        {
+                // don't render backgrounds for item buffer
+                if (mUseItemBuffer)
+                {
+                        clearSpecialCaseRenderQueues();
+                        getRenderQueue()->clear();
+                }
+
                 // the objects of different layers (e.g., background, scene, 
                 // overlay) must be identified and rendered one after another
@@ -272 +272 @@
 
                 TerrainSceneManager::_renderVisibleObjects();
+                
 
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
+                // delete previously rendered contenbt
                 _deleteRenderedQueueGroups();
 #endif
@@ -284 +286 @@
 
 
-                //-- set all necessary parameters for hierarchical visibility culling and rendering
+                // set all necessary parameters for 
+                // hierarchical visibility culling and rendering
                 InitVisibilityCulling(mCameraInProgress);
 
                 /** 
                 * the hierarchical culling algorithm
-                * if using depth pass: will just find objects and update depth buffer
-                * for "delayed" rendering: will render some passes afterwards, e.g. transparents
+                * if we use a depth pass: will just find objects and update depth buffer
+                * for "delayed" rendering: will render some passes afterwards, e.g., transparents
                 **/
                 
@@ -302 +305 @@
                 //-- reset parameters
                 mRenderDepthPass = false;
+                mRenderItemBuffer = false;
                 mSkipTransparents = false;
                 mLeavePassesInQueue = 0;
                 mShadowTechnique = mSavedShadowTechnique;
-                mRenderItemBuffer = false;
+                
 
                 // add visible nodes found by the visibility culling algorithm
@@ -326 +330 @@
         TerrainRenderable::setCurrentRenderLevelIndex(levelIdx);
 
-        getRenderQueue()->clear();
-
         // reset ambient light
         setAmbientLight(savedAmbient);
+
+        getRenderQueue()->clear();
         //WriteLog(); // write out stats
 }
@@ -404 +408 @@
                 return true;
         }
-        if (key == "ItemBuffer")
-        {
-                mRenderItemBuffer = (*static_cast<const bool *>(val));
+        if (key == "UseItemBuffer")
+        {
+                mUseItemBuffer = (*static_cast<const bool *>(val));
                 return true;
         }
@@ -425 +429 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::getOptionValues(const String & key, StringVector &refValueList)
+bool VisibilityTerrainSceneManager::getOptionValues(const String & key, 
+                                                                                                        StringVector &refValueList)
 {
         return TerrainSceneManager::getOptionValues( key, refValueList);
@@ -436 +441 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::setVisibilityManager(GtpVisibility::VisibilityManager *visManager)
+void VisibilityTerrainSceneManager::setVisibilityManager(GtpVisibility::
+                                                                                                                 VisibilityManager *visManager)
 {
         mVisibilityManager = visManager;
@@ -634 +640 @@
         InitItemBufferPass(); // create material for item buffer pass
 
+        // reset culling manager stats
+        mVisibilityManager->GetCullingManager()->InitFrame(mVisualizeCulledNodes);
+
         // save shadow technique. It will be reset after hierarchical culling
         mSavedShadowTechnique = mShadowTechnique;
 
-
-        mLeavePassesInQueue = 0;
-        
+        // render standard solids without shadows during hierarchical culling pass
+        if ((mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE) ||
+            (mShadowTechnique == SHADOWTYPE_STENCIL_MODULATIVE))
+        {
+        
+                mShadowTechnique = SHADOWTYPE_NONE;
+        }
+
+        // set depth pass flag before rendering
+        mRenderDepthPass = mUseDepthPass;
+
         // item buffer needs full ambient lighting to use item colors as unique id
         if (mUseItemBuffer) 
@@ -649 +666 @@
 
         // set passes which should be stored in render queue 
-        // for rendering after hierarchical culling
-
-        if (mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
-        {
-                // render standard solids without shadows during hierarchical culling pass
-                mShadowTechnique = SHADOWTYPE_NONE;
-
-                if (!mUseDepthPass)
-                {
-                        // TODO: remove this because should be processed in first pass
+        // for rendering AFTER hierarchical culling, i.e., passes which need 
+        // a special rendering order
+        mLeavePassesInQueue = 0;
+
+        if (!mUseDepthPass || !mUseItemBuffer)
+        {
+                if (mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
+                {
+                        // TODO: remove this pass because it should be processed during hierarchical culling
                         mLeavePassesInQueue |= RenderPriorityGroup::SOLID_PASSES_NOSHADOW;
 
@@ -664 +680 @@
                         mLeavePassesInQueue |= RenderPriorityGroup::SOLID_PASSES_DIFFUSE_SPECULAR;
                         mLeavePassesInQueue |= RenderPriorityGroup::TRANSPARENT_PASSES;
-                }
-        }
-        if (mShadowTechnique == SHADOWTYPE_STENCIL_MODULATIVE)
-        {
-                // render standard solids without shadows during hierarchical culling pass
-                mShadowTechnique = SHADOWTYPE_NONE;
-
-                if (!mUseDepthPass)
+
+                        // just render ambient stuff
+                        mIlluminationStage = IRS_AMBIENT;
+                }
+        
+                if (mShadowTechnique == SHADOWTYPE_STENCIL_MODULATIVE)
                 {
                         mLeavePassesInQueue |= RenderPriorityGroup::SOLID_PASSES_NOSHADOW;
                         mLeavePassesInQueue |= RenderPriorityGroup::TRANSPARENT_PASSES;
                 }
-        }
-        
-        if (mDelayRenderTransparents && (!mUseDepthPass))
-        {
-                mLeavePassesInQueue |= RenderPriorityGroup::TRANSPARENT_PASSES;
-        }
-        //std::stringstream d; d << "leave passes in queue: " << mLeavePassesInQueue;LogManager::getSingleton().logMessage(d.str());
+        
+                // transparents should be rendered after hierarchical culling to 
+                // provide front-to-back ordering
+                if (mDelayRenderTransparents)
+                {
+                        mLeavePassesInQueue |= RenderPriorityGroup::TRANSPARENT_PASSES;
+                }
+        }
+
+        // skip rendering transparents in the hierarchical culling
+        // (because they will be rendered afterwards)
+        mSkipTransparents = mUseDepthPass || 
+                (mLeavePassesInQueue & RenderPriorityGroup::TRANSPARENT_PASSES);
 
         // possible two cameras (one for culling, one for rendering)
@@ -689 +709 @@
                                                 mLeavePassesInQueue);
                 
-        
-        // reset culling manager stats
-        mVisibilityManager->GetCullingManager()->InitFrame(mVisualizeCulledNodes);
-
-        // set depth pass flag before rendering
-        mRenderDepthPass = mUseDepthPass;
-        // set flag for skipping transparents in the hierarchical culling pass
-        mSkipTransparents = mUseDepthPass || 
-                (mLeavePassesInQueue & RenderPriorityGroup::TRANSPARENT_PASSES);
-}
-
+        //std::stringstream d; d << "leave passes in queue: " << mLeavePassesInQueue;LogManager::getSingleton().logMessage(d.str());
+}
+//-----------------------------------------------------------------------
+OctreeHierarchyInterface *VisibilityTerrainSceneManager::GetHierarchyInterface()
+{
+        return mHierarchyInterface;
+}
 //-----------------------------------------------------------------------
 /*void VisibilityTerrainSceneManager::renderBasicQueueGroupObjects(RenderQueueGroup* pGroup)
 {
-    // Basic render loop
-    // Iterate through priorities
+    // Basic render loop: Iterate through priorities
     RenderQueueGroup::PriorityMapIterator groupIt = pGroup->getIterator();
 
@@ -714 +729 @@
         pPriorityGrp->sort(mCameraInProgress);
 
-                //TODO: render other splid passes for shadows
-        // Do solids
+                // Do solids
+                // TODO: render other solid passes for shadows
         renderObjects(pPriorityGrp->_getSolidPassesNoShadows(), true);