Changeset 1597 for GTP/trunk/Lib

Timestamp:

10/10/06 09:05:48 (18 years ago)

Author:

mattausch

Message:

added demo hack

File:

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

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

@@ -168 +168 @@
         // ignore
     }
+
         // add bounding boxes of rendered objects
         if (0)
@@ -175 +176 @@
         }
 
-        MovableObjectsMap::const_iterator mit, mit_end = mViewCellsGeometry.end();
-/*
-        for (mit = mViewCellsGeometry.begin(); mit != mit_end; ++ mit)
-        {
-                (*mit).second->_updateRenderQueue(getRenderQueue());
-        }
-*/      
-
-        if (mRenderNodesForViz || mRenderNodesContentForViz)
+        // set old view cell geometry to invisible
+    if (mCurrentViewCell && mCurrentViewCell->GetMesh())
+        {
+                const int id = mCurrentViewCell->GetId();
+                mViewCellsGeometry[id]->_updateRenderQueue(getRenderQueue());
+        }
+
+    if (mRenderNodesForViz || mRenderNodesContentForViz)
         {
                 // HACK: change node material so it is better suited for visualization
@@ -195 +195 @@
                         if (mRenderNodesForViz)
                         {
-                                // render the leaf nodes
+                                // render the visible leaf nodes
                                 if ((*it)->numAttachedObjects() && 
                                         !(*it)->numChildren() && 
@@ -201 +201 @@
                                         (*it)->getAttachedObject(0)->isVisible())
                                 {
-                                        getRenderQueue()->addRenderable((*it));
+                                        //getRenderQueue()->addRenderable((*it));
+                                        (*it)->_addToRenderQueue(cam, getRenderQueue(), false);
                                 }
 
-                                // addbounding boxes instead of node itself
+                                // add bounding boxes instead of node itself
                                 //(*it)->_addBoundingBoxToQueue(getRenderQueue());
                         }
 
                         // add renderables itself
-                        if (mRenderNodesContentForViz) 
+                        if (0 && mRenderNodesContentForViz) 
                         {
                                 (*it)->_addToRenderQueue(cam, getRenderQueue(), false);
@@ -296 +297 @@
                                                                                                                 bool onlyShadowCasters)
 {
+        ///////////
+        //-- set visibility according to pvs of current view cell
+
+        UpdatePvs(cam);
+
         if (mNormalExecution)
         {
@@ -311 +317 @@
         else 
         {       
-                // for hierarchical culling, we interleave identification 
+                // hierarchical culling interleaves identification 
                 // and rendering of objects in _renderVisibibleObjects
 
                 // for the shadow pass we use only standard rendering
-                // because of low occlusion
+                // because shadows have low occlusion snyway
                 if (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
                         mIlluminationStage == IRS_RENDER_TO_TEXTURE)
@@ -324 +330 @@
                 // only shadow casters will be rendered in shadow texture pass
                 if (0) mHierarchyInterface->SetOnlyShadowCasters(onlyShadowCasters);
-
-                ///////////
-                //-- apply view cell pvs
-                UpdatePvs(cam);
         }
                 
@@ -453 +455 @@
                         }
                 }
+                /*const bool mVisualizeViewCells = true;
+                if (mVisualizeViewCells)
+                {
+                        MovableObjectsMap::const_iterator mit, mit_end = mViewCellsGeometry.end();
+                        
+                        for (mit = mViewCellsGeometry.begin(); mit != mit_end; ++ mit)
+                        {
+                                (*mit).second->_updateRenderQueue(getRenderQueue());
+                        }       
+                }*/
 
                 /////////////
                 //-- now we can render all remaining queue objects
                 //-- used for depth pass, transparents, overlay
-                clearSpecialCaseRenderQueues();
+
+        clearSpecialCaseRenderQueues();
 
                 TerrainSceneManager::_renderVisibleObjects();
@@ -714 +727 @@
                         // Do transparents (always descending)
                         renderObjects(pPriorityGrp->getTransparents(), 
-                        QueuedRenderableCollection::OM_SORT_DESCENDING, true);
+                                QueuedRenderableCollection::OM_SORT_DESCENDING, true);
                 }
 
@@ -1029 +1042 @@
                    // Sort the queue first
                    pPriorityGrp->sort(mCameraInProgress);
-
                    // Do (shadowable) solids
                    OctreeSceneManager::renderObjects(pPriorityGrp->getSolidsBasic(), om, true);
@@ -1118 +1130 @@
 
         mElementaryViewCell = newElementary;
-        LogManager::getSingleton().logMessage("unloading");
-        
-                std::stringstream d;
-                d << "here2 " << mViewCellsGeometry.size();
-                LogManager::getSingleton().logMessage(d.str());
+        
 
         //////////////
@@ -1128 +1136 @@
 
         ApplyViewCellPvs(mCurrentViewCell, false);
-
-        // set old view cell geometry to invisible
-    if (mCurrentViewCell && mCurrentViewCell->GetMesh())
-        {
-                const int id = mCurrentViewCell->GetId();
-                
-                std::stringstream str;
-                str << "id : " << id << " of " << mViewCellsGeometry.size();
-                LogManager::getSingleton().logMessage(str.str());
-
-                mViewCellsGeometry[id]->setVisible(false);
-        }
 
         // the new view cell
@@ -1155 +1151 @@
         else
         {
-                viewCell = newElementary;LogManager::getSingleton().logMessage("here55");
+                viewCell = newElementary;
         }
 
         ///////////////
         //-- load new pvs
-
-        // set new view cell geometry to invisible
-        if (viewCell && viewCell->GetMesh())
-        {
-                const int id = viewCell->GetId();
-                
-                std::stringstream str;
-                str << "id : " << id << " of " << mViewCellsGeometry.size();
-                LogManager::getSingleton().logMessage(str.str());
-
-                mViewCellsGeometry[id]->setVisible(false);
-        }
 
         ApplyViewCellPvs(viewCell, true);
@@ -1200 +1184 @@
 
                 std::stringstream str;
-                str << "id : " << viewCell->GetId();
-
+                str << "processing view cell with id : " << viewCell->GetId();
+                LogManager::getSingleton().logMessage(str.str());
                 ManualObject *manual = OgreTypeConverter::ConvertToOgre(viewCell->GetMesh(), this);
                 mViewCellsGeometry[viewCell->GetId()] = manual;
@@ -1207 +1191 @@
                 // attach to scene node
                 getRootSceneNode()->createChildSceneNode()->attachObject(manual);
-                
+                manual->setQueryFlags(0); // returned by no query
                 // initialy set to invisible
-                manual->setVisible(false);
+                //manual->setVisible(false);
         }
 }