Changeset 1595 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Timestamp:

10/10/06 01:27:11 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Files:

• OgreBoundingBoxConverter.cpp (modified) (1 diff)
• OgreBvHierarchySceneManager.cpp (modified) (3 diffs)
• OgreKdTreeSceneManager.cpp (modified) (1 diff)
• OgreOcclusionCullingSceneManager.cpp (modified) (3 diffs)
• OgrePlatformHierarchyInterface.cpp (modified) (1 diff)

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

@@ -9 +9 @@
 namespace Ogre
 {
-//-------------------------------------------------------------------------
-OgreBoundingBoxConverter::OgreBoundingBoxConverter(OctreeSceneManager *sm):
-mOctSceneMgr(sm), mKdSceneMgr(0)
-{
-}
-//-------------------------------------------------------------------------
-OgreBoundingBoxConverter::OgreBoundingBoxConverter(KdTreeSceneManager *sm):
-mOctSceneMgr(0), mKdSceneMgr(sm)
-{
-}
-//-------------------------------------------------------------------------
-bool OgreBoundingBoxConverter::IdentifyObjects(const GtpVisibilityPreprocessor::IndexedBoundingBoxContainer &iboxes,
-                                                                                           GtpVisibilityPreprocessor::ObjectContainer &objects) const
-{
-        GtpVisibilityPreprocessor::IndexedBoundingBoxContainer::
-                const_iterator iit, iit_end = iboxes.end();
-  
-        for (iit = iboxes.begin(); iit != iit_end; ++ iit)
-        {
-                const GtpVisibilityPreprocessor::AxisAlignedBox3 box = (*iit).second;
-                const AxisAlignedBox currentBox = OgreTypeConverter::ConvertToOgre(box);
-   
-                Entity *ent = FindCorrespondingObject(currentBox);
-
-                // create new mesh instance
-                OgreMeshInstance *omi = new OgreMeshInstance(ent);
-                omi->SetId((*iit).first);
-                objects.push_back(omi);
-        }
-
-        return true;
-}
-//-------------------------------------------------------------------------
-inline static AxisAlignedBox EnlargeBox(const AxisAlignedBox &box)
-{
-        const float eps = 1e-3f;
-        const Vector3 veps(eps, eps, eps);
-
-        Vector3 max = box.getMaximum();
-        Vector3 min = box.getMinimum();
-
-        return AxisAlignedBox(min - veps, max + veps);
-}
-//-----------------------------------------------------------------------
-Entity *OgreBoundingBoxConverter::FindCorrespondingObject(const AxisAlignedBox &box) const
-{
-        list<SceneNode *> sceneNodeList;
-        AxisAlignedBox mybox = EnlargeBox(box);
-        //AxisAlignedBox dummy(Vector3(-50000, -50000, -50000), Vector3(50000, 50000, 50000));
-        
-        // get intersecting scene nodes
-        if (mOctSceneMgr)
-                mOctSceneMgr->findNodesIn(mybox, sceneNodeList, NULL);
-        else if (mKdSceneMgr)
-                mKdSceneMgr->findNodesIn(mybox, sceneNodeList, NULL);
-        else
-                OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR, "Bounding Box Converter cannot "
-                "find appropriate scene manager.", "OgreBoundingBoxConverter::FindCorrespondingObject");
-        
-
-        list<SceneNode *>::const_iterator sit, sit_end = sceneNodeList.end();
-
-        // minimal overlap
-        float overlap = 0;//1e-6;
-
-        Entity *bestFittingObj = NULL;
-        float bestFit = overlap;
-
-        // perfect fit threshold
-        const float thresh = 1.0 - GtpVisibilityPreprocessor::Limits::Small;
 
 
-        // find the bbox which is closest to the current bbox
-        for (sit = sceneNodeList.begin(); sit != sceneNodeList.end(); ++ sit)
-        {
-                SceneNode *sn = *sit;
-                SceneNode::ObjectIterator oit = sn->getAttachedObjectIterator();
-
-        while (oit.hasMoreElements())
-                {
-                        MovableObject *mo = oit.getNext();
-
-                        // we are only interested in scene entities
-                        if (mo->getMovableType() != "Entity")
-                        {
-                                continue;
-                        }
-                         
-                        const AxisAlignedBox bbox = EnlargeBox(mo->getWorldBoundingBox());
-                                        
-
-                        // compute measure how much aabbs overlap
-                        overlap = RatioOfOverlap(OgreTypeConverter::ConvertFromOgre(mybox),
-                                                                         OgreTypeConverter::ConvertFromOgre(bbox));
-        
-                         if (overlap > bestFit)
-                         {
-                                 bestFit = overlap;
-                        
-                                 bestFittingObj = static_cast<Entity *>(mo);
-
-                                 // perfect fit => object found, early exit
-                                 if (overlap >= thresh)
-                                         return bestFittingObj;                         
-                         }
-                }
-        }
-
-        if (0)
-        {
-                std::stringstream d; 
-                if (bestFittingObj)
-                        d << "best fit: " << bestFit;     
-                else
-                        d << "warning, objects do not fit\n" << box;
-        
-                Ogre::LogManager::getSingleton().logMessage(d.str());
-        }
-
-        return bestFittingObj;
-}
 
 }

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

@@ -27 +27 @@
 {
 
-BvHierarchySceneManager::BvHierarchySceneManager(const String& name, GtpVisibility::VisibilityManager *vm):
+BvHierarchySceneManager::BvHierarchySceneManager(const String& name, 
+                                                                                                 GtpVisibility::VisibilityManager *vm):
 SceneManager(name), 
 mVisibilityManager(vm), 
@@ -1323 +1324 @@
         // converter between view cell ids and Ogre entites 
         GtpVisibilityPreprocessor::IndexedBoundingBoxContainer iboxes;
-#if 0
-        OgreBoundingBoxConverter bconverter(this);
-
-        // load the view cells assigning the found objects to the pvss
+        BvhBoundingBoxConverter bconverter(this);
+
+        // load the view cells and assigns the objects in the pvs to 
+        // the scene objects using the bounding boxes
         mViewCellsManager = 
                 GtpVisibilityPreprocessor::ViewCellsManager::LoadViewCells(filename, &mObjects, false, &bconverter);
 
         return (mViewCellsManager != NULL);
-#endif
 }
 //-------------------------------------------------------------------------
 void BvHierarchySceneManager::applyViewCellPvs(GtpVisibilityPreprocessor::ViewCell *vc, 
                                                                                                         const bool load)
-{       // NOTE: should not happen, rather apply view cell representing unbounded space then
+{       // NOTE: should not happen, rather apply view cell 
+        // representing unbounded space then
         if (!vc) 
-        {       
-                // set everything visible for savety
+        {       // set everything visible for savety
                 SetObjectsVisible(true);
-
                 return;
         }
@@ -1348 +1347 @@
                 oit_end = vc->GetPvs().mEntries.end();
 
+        //////////////
         //-- PVS of view cell
         for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)

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

@@ -1322 +1322 @@
         // converter between view cell ids and Ogre entites 
         GtpVisibilityPreprocessor::IndexedBoundingBoxContainer iboxes;
-        OgreBoundingBoxConverter bconverter(this);
+        KdTreeBoundingBoxConverter bconverter(this);
 
         // load the view cells assigning the found objects to the pvss

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

@@ -593 +593 @@
                         // reset view cell
                         OGRE_DELETE(mCurrentViewCell);
-
+                        
                         if (mUseViewCells)
                         {
@@ -601 +601 @@
                         mElementaryViewCell = NULL;
 
-                        // if using view cells, all objects are set to false initially
+                        // if we use view cells, all objects are set to false initially
                         SetObjectsVisible(!mUseViewCells);
                 }
@@ -1060 +1060 @@
         // converter between view cell ids and Ogre entites 
         GtpVisibilityPreprocessor::IndexedBoundingBoxContainer iboxes;
-        OgreBoundingBoxConverter bconverter(this);
+        OctreeBoundingBoxConverter bconverter(this);
 
         // load the view cells assigning the found objects to the pvss

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

@@ -125 +125 @@
 {
         // create new query if there is no query left
-        if (mCurrentTestIdx == mOcclusionQueries.size())
+        if (mCurrentTestIdx == (int)mOcclusionQueries.size())
         {
                 mOcclusionQueries.push_back(new PlatformOcclusionQuery(mRenderSystem));
-        }
-
-        std::stringstream d;
-        d << "resizing queries: " << (int)mOcclusionQueries.size() << std::endl;
-        LogManager::getSingleton().logMessage(d.str());
+
+                std::stringstream d;
+                d << "resizing queries: " << (int)mOcclusionQueries.size() << std::endl;
+                LogManager::getSingleton().logMessage(d.str());
+        }
         
         return mOcclusionQueries[mCurrentTestIdx ++];