Changeset 2097 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Timestamp:

02/06/07 20:33:48 (18 years ago)

Author:

mattausch

Message:

revived ogre engine pvs

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreBoundingBoxConverter.h (modified) (4 diffs)
• src/OgreKdTreeSceneManager.cpp (modified) (1 diff)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (24 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreBoundingBoxConverter.h

@@ -180 +180 @@
 {
         list<SceneNode *> sceneNodeList;
-                        
+
         // find intersecting scene nodes to get candidates for intersection
     // note: this function has to be provided by scene manager
+
 #if ENLARGE_NODE_BBOX
         // make search radius larger
-        AxisAlignedBox mybox = EnlargeBox(box);
-        mSceneMgr->findNodesIn(mybox, sceneNodeList, NULL);
+        AxisAlignedBox largebox = EnlargeBox(box);
+        mSceneMgr->findNodesIn(largebox, sceneNodeList, NULL);
 
         list<SceneNode *>::const_iterator sit, sit_end = sceneNodeList.end();
 
         GtpVisibilityPreprocessor::AxisAlignedBox3 nodeBox = 
-                OgreTypeConverter::ConvertFromOgre(mybox);
+                OgreTypeConverter::ConvertFromOgre(largebox);
 #else
 
@@ -201 +202 @@
                 OgreTypeConverter::ConvertFromOgre(box);
 #endif
-        
+
         // loop through the intersected scene nodes
         for (sit = sceneNodeList.begin(); sit != sceneNodeList.end(); ++ sit)
@@ -233 +234 @@
         }
 }
+
 #if USE_KD_PVS
 //-------------------------------------------------------------------------
@@ -255 +257 @@
                 EngineIntersectable *entry = 
                         new EngineIntersectable(entryObjects);
+
                 entry->SetId((*iit).first);
 

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

@@ -364 +364 @@
         else if (strKey == "UseViewCells")
         { 
+                        Ogre::LogManager::getSingleton().logMessage("here44");
                 if (mViewCellsLoaded)
                 {
+                                Ogre::LogManager::getSingleton().logMessage("here99");
                         mUseViewCells = *static_cast<const bool *>(pValue);
 

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

@@ -136 +136 @@
                                                                                                         const String& typeName)
 {
-    // Clear out any existing world resources (if not default)
+        // Clear out any existing world resources (if not default)
     if (ResourceGroupManager::getSingleton().getWorldResourceGroupName() != 
         ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME)
@@ -150 +150 @@
     loadConfig(stream);
 
-        // apply parameters for file loading
-
-        // loas the scene
+        //////////////
+        // file loading
+
+        // load the scene
         LoadScene(mFilename);
-
+        
         // load view cells
-        mViewCellsLoaded = LoadViewCells(mViewCellsFilename);
+        //mViewCellsLoaded = LoadViewCells(mViewCellsFilename);
 
         if (mShowTerrain)
@@ -170 +171 @@
                 maxAxis = std::max(maxAxis, max_z);
                 //resize(AxisAlignedBox( 0, 0, 0, maxAxis, maxAxis, maxAxis));
-                resize( AxisAlignedBox( 0, 0, 0, max_x, max_y, max_z ) );
+                resize(AxisAlignedBox( 0, 0, 0, max_x, max_y, max_z ));
 
                 setupTerrainMaterial();
@@ -177 +178 @@
  }
 #endif
+
 //-------------------------------------------------------------------------
 void OcclusionCullingSceneManager::loadConfig(DataStreamPtr& stream)
@@ -211 +213 @@
                 {
                         mShowTerrain = true;
-                        LogManager::getSingleton().logMessage("creating terrain");
+                        LogManager::getSingleton().logMessage("loading terrain");
                 }
         }
@@ -221 +223 @@
                 if (!val.empty())
                 {
-                        mViewCellsFilename = val.c_str();
-                        d << "view cells file name: " << mViewCellsFilename;
-                        LogManager::getSingleton().logMessage(d.str());
-                }
-        }
-        
+                        mViewCellsFilename = val;
+                }
+        }
+
         val = config.getSetting("OnlineCullingAlgorithm");
                 
@@ -262 +262 @@
         }
 
-        /////////////////////////////////////////
+        /////////////
         // terrain options
 
@@ -268 +268 @@
                 return;
 
-        val = config.getSetting( "DetailTile" );
-        if ( !val.empty() )
+        val = config.getSetting("DetailTile");
+        if (!val.empty())
                 setDetailTextureRepeat(atoi(val.c_str()));
 
-        val = config.getSetting( "MaxMipMapLevel" );
-        if ( !val.empty() )
-                setMaxGeoMipMapLevel(atoi( val.c_str() ));
-
-
-        val = config.getSetting( "PageSize" );
-        if ( !val.empty() )
-                setPageSize(atoi( val.c_str() ));
+        val = config.getSetting("MaxMipMapLevel");
+        if (!val.empty())
+                setMaxGeoMipMapLevel(atoi(val.c_str()));
+
+
+        val = config.getSetting("PageSize");
+        if (!val.empty())
+                setPageSize(atoi(val.c_str()));
         else
                 OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "Missing option 'PageSize'",
@@ -285 +285 @@
 
 
-        val = config.getSetting( "TileSize" );
-        if ( !val.empty() )
-                setTileSize(atoi( val.c_str() ));
+        val = config.getSetting("TileSize");
+        if (!val.empty())
+                setTileSize(atoi(val.c_str()));
         else
                 OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "Missing option 'TileSize'",
@@ -472 +472 @@
                                         for (eit = entries->begin(); eit != eit_end; ++ eit)
                                         {
-                                                //OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(*eit);
+                                        
                                                 Entity *ent = *eit;
                                                 Any newAny = ent->getUserAny();
 
                                                 int flt = any_cast<int>(newAny);
-                                                //std::stringstream d; d << "any: " << flt << " ";
-                                                //Ogre::LogManager::getSingleton().logMessage(d.str());
+                                        
                                                 if (any_cast<int>(newAny) == 0)
                                                 {
@@ -485 +484 @@
                                                 }
 
-                                                //GtpVisibilityPreprocessor::Debug << "assigned id " << omi->GetId() << endl;
                                         }
                                 }
@@ -883 +881 @@
         }
         if (key == "UseViewCells")
-        { 
+        {       
+                if (!mViewCellsLoaded)
+                {
+                        // try ro loaded view cells
+                        mViewCellsLoaded = LoadViewCells(mViewCellsFilename);   
+                }
+
+                if (!mViewCellsLoaded)
+                        return false;
+                
                 // only use this option if view cells are available
-                if (mViewCellsLoaded)
-                {
-                        mUseViewCells = *static_cast<const bool *>(val);
-
-                        // reset view cell
-                        OGRE_DELETE(mCurrentViewCell);
+
+                mUseViewCells = *static_cast<const bool *>(val);
+
+                // reset view cell
+                OGRE_DELETE(mCurrentViewCell);
                         
-                        if (mUseViewCells)
-                        {
-                                mCurrentViewCell = mViewCellsManager->GenerateViewCell();
-                        }
-                        // view cell corresponding to leaf in the view cell hierarchy
-                        mElementaryViewCell = NULL;
-
-                        // if we decide use view cells
-                        // all objects are set to invisible per default
-                        SetObjectsVisible(!mUseViewCells);
-
-                        MovableObjectIterator movit = getMovableObjectIterator("Entity");
-                        while (movit.hasMoreElements())
-                        {
-                                Entity *ent = static_cast<Entity *>(movit.getNext());
-                                ent->setVisible(!mUseViewCells);
-                        }
-                }
-
+                if (mUseViewCells)
+                {
+                        mCurrentViewCell = mViewCellsManager->GenerateViewCell();
+                }
+                
+                // view cell corresponding to leaf in the view cell hierarchy
+                mElementaryViewCell = NULL;
+
+                // with view cells all objects are set to invisible per default
+                SetObjectsVisible(!mUseViewCells);
+
+                MovableObjectIterator movit = getMovableObjectIterator("Entity");
+                while (movit.hasMoreElements())
+                {
+                        Entity *ent = static_cast<Entity *>(movit.getNext());
+                        ent->setVisible(!mUseViewCells);
+                }
+                
                 return true;
         }
@@ -1422 +1427 @@
 bool OcclusionCullingSceneManager::LoadViewCells(const String &filename)
 {
+        // no filename specified
         if (filename == "")
                 return false;
 
+        // view cells already loaded
         if (mViewCellsLoaded) 
                 return true;
@@ -1432 +1439 @@
 
         // load the view cells assigning the found objects to the pvss
-        const bool finalizeViewCells = true;
+        const bool finalizeViewCells = false;
 
         mViewCellsManager = GtpVisibilityPreprocessor::
@@ -1439 +1446 @@
                                                                                 true, 
                                                                                 &bconverter);
+        
+        Ogre::LogManager::getSingleton().logMessage("*******************");
 
         // objects are set to invisible initially
@@ -1453 +1462 @@
 void OcclusionCullingSceneManager::ApplyViewCellPvs(GtpVisibilityPreprocessor::ViewCell *vc, 
                                                                                                         const bool load)
-{       // NOTE: should not encounter NULL view cell, 
+{       
+        // NOTE: should not encounter NULL view cell, 
         // rather apply view cell representing unbounded space then
         if (!vc) 
         {       
-                // if no there is no view cell, set everything visible
+                LogManager::getSingleton().logMessage("error: should not come here");
+                // question: if no view cell, set everything visible?
                 //SetObjectsVisible(true);
                 SetObjectsVisible(false);
@@ -1467 +1478 @@
         ////////////
         //-- set PVS of view cell to visible
+
+        std::stringstream d; d << "appying new view cell pvs: " << vc->GetPvs().GetSize();
+        LogManager::getSingleton().logMessage(d.str());
 
         while (pit.HasMoreEntries())
@@ -1482 +1496 @@
                                         OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(obj);
                                         omi->GetEntity()->setVisible(load);
-                                        //GtpVisibilityPreprocessor::Debug << "assigned id " << omi->GetId() << endl;
-                                }
+                                }                               
                                 break;
                         case GtpVisibilityPreprocessor::Intersectable::ENGINE_INTERSECTABLE:
                                 {
-                                        //GtpVisibilityPreprocessor::EngineIntersectable *oi = 
-                                        //      static_cast<GtpVisibilityPreprocessor::EngineIntersectable *>(entry);
                                         EngineIntersectable *oi = static_cast<EngineIntersectable *>(obj);
 
-                                        //GtpVisibilityPreprocessor::ObjectContainer *entries = oi->GetItem();
                                         EntityContainer *entries = oi->GetItem();
 
@@ -1498 +1508 @@
                                         for (eit = entries->begin(); eit != eit_end; ++ eit)
                                         {
-                                                //OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(*eit);
-                                                //omi->GetEntity()->setVisible(load);
                                                 Entity *ent = *eit;
                                                 ent->setVisible(load);                                  
-                                                //GtpVisibilityPreprocessor::Debug << "assigned id " << omi->GetId() << endl;
                                         }
                                 }
@@ -1520 +1527 @@
                 OgreTypeConverter::ConvertFromOgre(cam->getDerivedPosition());
 
+        //std::stringstream d; d << "vp: " << viewPoint;
+        //LogManager::getSingleton().logMessage(d.str());
+
         GtpVisibilityPreprocessor::ViewCell *newElementary = 
                 mViewCellsManager->GetViewCell(viewPoint);
 
-        // elementary view cell did not change => apply same pvs
+        // elementary view cell did not change => don't change pvs
         if (mElementaryViewCell == newElementary)
                 return;
@@ -1557 +1567 @@
         ApplyViewCellPvs(viewCell, true);
 
-        // store pvs
         if (viewCell)
         {
+                // store current view cell
                 mCurrentViewCell->SetPvs(viewCell->GetPvs());
                 mCurrentViewCell->SetMesh(viewCell->GetMesh());
@@ -1691 +1701 @@
                 return false;
         }
-
+/*
         for (fit = filenames.begin(); fit != fit_end; ++ fit, ++ i)
         {
@@ -1709 +1719 @@
                 result = true;
         }
-        
+*/      result=true;
         return result;
 }
@@ -1771 +1781 @@
                 const String& instanceName)
 {
-        OcclusionCullingSceneManager* tsm = new OcclusionCullingSceneManager(instanceName, visManager);
+        OcclusionCullingSceneManager* tsm = 
+                new OcclusionCullingSceneManager(instanceName, visManager);
         
         // Create & register default sources (one per manager)