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

Timestamp:

05/10/06 08:05:24 (19 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreOcclusionCullingSceneManager.h (modified) (2 diffs)
• include/OgrePlatformHierarchyInterface.h (modified) (2 diffs)
• src/OgreBoundingBoxConverter.cpp (modified) (3 diffs)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (7 diffs)
• src/OgreOctreeHierarchyInterface.cpp (modified) (2 diffs)
• src/OgrePlatformHierarchyInterface.cpp (modified) (2 diffs)
• src/OgrePlatformOcclusionQuery.cpp (modified) (1 diff)
• src/OgreVisibilitySceneManagerDll.cpp (modified) (1 diff)

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

@@ -108 +108 @@
         /** Loads view cells for this particular scene.
         */
-        void LoadViewCells(std::string filename);
+        bool LoadViewCells(const String &filename);
 
 protected:
@@ -210 +210 @@
         bool mUseViewCells;
 
-        
         /// if the view cells are filtered
         bool mUseVisibilityFilter;

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

@@ -20 +20 @@
         @remark also provides methods for using occlusion queries on the hierarchy nodes
 */
+typedef std::vector<PlatformOcclusionQuery *> OcclusionQueryContainer;
+
 class PlatformHierarchyInterface: public GtpVisibility::HierarchyInterface
 {
@@ -151 +153 @@
         AxisAlignedBox mBox;
         
-        std::vector<PlatformOcclusionQuery *> mOcclusionQueries;
+        OcclusionQueryContainer mOcclusionQueries;
 
         Vector3 mCameraPosition;

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

@@ -19 +19 @@
         GtpVisibilityPreprocessor::IndexedBoundingBoxContainer::
                 const_iterator iit, iit_end = iboxes.end();
-
+std::stringstream d; d << "here75557\n";
+   LogManager::getSingleton().logMessage(d.str());
         for (iit = iboxes.begin(); iit != iit_end; ++ iit)
         {
                 const GtpVisibilityPreprocessor::AxisAlignedBox3 box = (*iit).second;
                 const AxisAlignedBox currentBox = OgreTypeConverter::ConvertToOgre(box);
-        
+std::stringstream d; d << "here77\n";
+   LogManager::getSingleton().logMessage(d.str());
                 Entity *ent = FindCorrespondingObject(currentBox);
 
@@ -51 +53 @@
         AxisAlignedBox mybox = EnlargeBox(box);
         //AxisAlignedBox dummy(Vector3(-50000, -50000, -50000), Vector3(50000, 50000, 50000));
-        
+        std::stringstream d; d << "here3 idenbtiy 8888\n";
+        LogManager::getSingleton().logMessage(d.str());
         //-- get intersecting scene nodes
         mSceneMgr->findNodesIn(mybox, sceneNodeList, NULL);
@@ -58 +61 @@
         list<SceneNode *>::const_iterator sit, sit_end = sceneNodeList.end();
 
-        float overlap = 0;//GtpVisibilityPreprocessor::Limits::Small;
+        // minimal overlap
+        float overlap = 0;//1e-6;
 
         Entity *bestFittingObj = NULL;

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

@@ -66 +66 @@
         // TODO: set maxdepth to reasonable value
         mMaxDepth = 50;
-
-        //loadVisibilityConfig("GtpVisibility.cfg");
-        //LoadViewCells("");
-        //mViewCellsLoaded = true;
 }
 //-----------------------------------------------------------------------
@@ -137 +133 @@
     mTerrainPages.clear();
     // Load the configuration
-    loadConfig( stream );
+    loadConfig(stream);
         initLevelIndexes();
 
@@ -555 +551 @@
                 if (!mViewCellsLoaded)
                 {
-                        LoadViewCells(static_cast<const char *>(val));
-                        mViewCellsLoaded = true;        
-                }
-
-                return true;
+                        String filename(static_cast<const char *>(val));
+                        mViewCellsLoaded = LoadViewCells(filename);     
+                }
+
+                return mViewCellsLoaded;
         }
         if (key == "UseViewCells")
         { 
-                mUseViewCells = *static_cast<const bool *>(val);
-
-                // reset view cell
-                OGRE_DELETE(mCurrentViewCell);
-                if (mUseViewCells)
-                        mCurrentViewCell =  mViewCellsManager->GenerateViewCell();
-                mElementaryViewCell = NULL;
-                // if using view cells, all objects are set to false initially
-                SetObjectsVisible(!mUseViewCells);
-                
+                if (mViewCellsLoaded)
+                {
+                        LogManager::getSingleton().logMessage("here3");
+                        mUseViewCells = *static_cast<const bool *>(val);
+
+                        // reset view cell
+                        OGRE_DELETE(mCurrentViewCell);
+
+                        if (mUseViewCells)
+                                mCurrentViewCell = mViewCellsManager->GenerateViewCell();
+
+                        mElementaryViewCell = NULL;
+
+                        // if using view cells, all objects are set to false initially
+                        SetObjectsVisible(!mUseViewCells);
+                }
+
                 return true;
         }
@@ -1011 +1014 @@
                 OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(*it);
                 Entity *ent = omi->GetMesh();
+                LogManager::getSingleton().logMessage("here999");
                 ent->setVisible(visible);
         }
 }
 //-----------------------------------------------------------------------
-void OcclusionCullingSceneManager::LoadViewCells(string filename)
-{
-        // the objects are set to invisible a prioriy
+bool OcclusionCullingSceneManager::LoadViewCells(const String &filename)
+{
+        // objects are set to invisible initially
         SetObjectsVisible(false);
-
+        
         const string bboxesFilename = mVisibilityManager->GetVisibilityEnvironment()->getViewCellsFileName();
 
+        // converter between view cell ids and Ogre entites 
         GtpVisibilityPreprocessor::IndexedBoundingBoxContainer iboxes;
         OgreBoundingBoxConverter bconverter(this);
 
+        
+        GtpVisibilityPreprocessor::Environment *env = 
+                mVisibilityManager->GetVisibilityEnvironment()->GetPreprocessorEnvironment();
+
         // load the view cells assigning the found objects to the pvss
         mViewCellsManager = 
-                GtpVisibilityPreprocessor::ViewCellsManager::LoadViewCells(filename, &mObjects, &bconverter);
-
-        std::stringstream d;
-        d << "view cells loaded" << endl;
-        Ogre::LogManager::getSingleton().logMessage(d.str());
+                GtpVisibilityPreprocessor::ViewCellsManager::LoadViewCells(filename, &mObjects, env, &bconverter);
+
+        if (!mViewCellsManager)
+        {
+                std::stringstream d;
+                d << "error loading view cells" << endl;
+                LogManager::getSingleton().logMessage(d.str());
+        }
+
+        return (mViewCellsManager != NULL);
 }
 //-------------------------------------------------------------------------
@@ -1041 +1055 @@
                 // set everything visible for savety
                 SetObjectsVisible(true);
-
+LogManager::getSingleton().logMessage("here7");
                 return;
         }
-                  
+                  LogManager::getSingleton().logMessage("here8");
         GtpVisibilityPreprocessor::ObjectPvsMap::const_iterator oit,
                         oit_end = vc->GetPvs().mEntries.end();
@@ -1055 +1069 @@
                 OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance*>((*oit).first);
                 omi->GetMesh()->setVisible(load);
-                //GtpVisibilityPreprocessor::Debug << "here45 " << omi->GetId() << endl;
+                GtpVisibilityPreprocessor::Debug << "here45 " << omi->GetId() << endl;
         }
 }
@@ -1061 +1075 @@
 void OcclusionCullingSceneManager::updatePvs(Camera *cam)
 {
-        if (mViewCellsLoaded && mUseViewCells)
-        {
-                const GtpVisibilityPreprocessor::Vector3 viewPoint = 
-                        OgreTypeConverter::ConvertFromOgre(cam->getDerivedPosition());
-
-                GtpVisibilityPreprocessor::ViewCell *newElementary = 
-                        mViewCellsManager->GetViewCell(viewPoint);
-
-                // elementary view cell did not change => apply same pvs
-                if (mElementaryViewCell == newElementary)
-                        return;
-
-                mElementaryViewCell = newElementary;
-
-                //-- unload old pvs
-                applyViewCellPvs(mCurrentViewCell, false);
-
-
-                //-- the new view cell
+        if (!(mViewCellsLoaded && mUseViewCells))
+                return;
+
+        const GtpVisibilityPreprocessor::Vector3 viewPoint = 
+                OgreTypeConverter::ConvertFromOgre(cam->getDerivedPosition());
+
+        GtpVisibilityPreprocessor::ViewCell *newElementary = 
+                mViewCellsManager->GetViewCell(viewPoint);
+
+        // elementary view cell did not change => apply same pvs
+        if (mElementaryViewCell == newElementary)
+                return;
+
+        mElementaryViewCell = newElementary;
+        LogManager::getSingleton().logMessage("unloading");
+        //-- unload old pvs
+        applyViewCellPvs(mCurrentViewCell, false);
+
+
+        //-- the new view cell
                 
-                GtpVisibilityPreprocessor::ViewCell *viewCell;
+        GtpVisibilityPreprocessor::ViewCell *viewCell;
 
                 
-                if (mUseVisibilityFilter)
-                {
-                        //-- compute new filtered cell
-                        GtpVisibilityPreprocessor::PrVs prvs;
-                        mViewCellsManager->GetPrVS(viewPoint, prvs, 5);
-                        viewCell = prvs.mViewCell;
-                }
-                else
-                {
-                        viewCell = newElementary;
-                }
-                        
-                //-- load new pvs
-                applyViewCellPvs(viewCell, true);
-
-                // store pvs
-                mCurrentViewCell->SetPvs(viewCell->GetPvs());
-
-                // delete merge tree of filtered view cell
-                if (mUseVisibilityFilter)
-                        mViewCellsManager->DeleteLocalMergeTree(viewCell);
-        }
+        if (mUseVisibilityFilter)
+        {
+                //-- compute new filtered cell
+                GtpVisibilityPreprocessor::PrVs prvs;
+                mViewCellsManager->GetPrVS(viewPoint, prvs, 5);
+                viewCell = prvs.mViewCell;
+        }
+        else
+        {
+                viewCell = newElementary;
+        }
+        LogManager::getSingleton().logMessage("loading");
+        //-- load new pvs
+        if (0)applyViewCellPvs(viewCell, true);
+
+        // store pvs
+        mCurrentViewCell->SetPvs(viewCell->GetPvs());
+
+        // delete merge tree of filtered view cell
+        if (mUseVisibilityFilter)
+                mViewCellsManager->DeleteLocalMergeTree(viewCell);
 }
 

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

@@ -112 +112 @@
                 octant->setLastRendered(mFrameId);
                 OctreeSceneManager *ocm = 
-                        //dynamic_cast<OctreeSceneManager *>(mSceneManager);
                         dynamic_cast<OctreeSceneManager *>(mSceneManager);
+
                 ocm->_renderOctant(mCamera, octant, mOnlyShadowCasters, mLeavePassesInQueue);
 
@@ -144 +144 @@
         // reuse box if node is the same
         // only create renderable bounding box for new node
-        if (1 || (node != mSavedNode))
+        if (node != mSavedNode)
         {
                 mSavedNode = node;

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

@@ -81 +81 @@
 void PlatformHierarchyInterface::ResetQueries()
 {
-        for (int i = 0; i < (int)mOcclusionQueries.size(); ++ i) OGRE_DELETE(mOcclusionQueries[i]);
+        OcclusionQueryContainer::iterator it, it_end = mOcclusionQueries.end();
+        for (it = mOcclusionQueries.begin(); it != it_end; ++ it)
+        {
+                PlatformOcclusionQuery *query = *it;
+                OGRE_DELETE(query);
+        }
 
         mCurrentTestIdx = 0;
@@ -121 +126 @@
 {
         // create new query if there is no query left
-        if (mCurrentTestIdx >= (int)mOcclusionQueries.size())
-        {
-                mCurrentTestIdx = (int)mOcclusionQueries.size();
+        if (mCurrentTestIdx == mOcclusionQueries.size())
+        {
                 mOcclusionQueries.push_back(new PlatformOcclusionQuery(mRenderSystem));
         }

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

@@ -35 +35 @@
         {
                 isAvailable = !mHardwareOcclusionQuery->isStillOutstanding();
-                //std::stringstream d; d << "available: " << isAvailable;
-                //Ogre::LogManager::getSingleton().logMessage(d.str());
         }
+
+//std::stringstream d; d << mHardwareOcclusionQuery << ", available: " << isAvailable << ", waitforresult: " << waitForResult;
+//              Ogre::LogManager::getSingleton().logMessage(d.str());
 
         if (isAvailable)

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

@@ -47 +47 @@
 extern "C" void __declspec(dllexport) dllStartPlugin(void)
 {
+        // load visibility environment
         visEnv = new GtpVisibility::VisibilityEnvironment();
-        visEnv->LoadEnvironment("simple.env");
+        //visEnv->LoadEnvironment("simple.env");
         visManager = new GtpVisibility::VisibilityManager(visEnv);