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

Timestamp:

05/08/06 18:57:11 (19 years ago)

Author:

mattausch

Message:

added bounding boxes to xml description

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreOcclusionCullingSceneManager.h (modified) (3 diffs)
• scripts/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (4 diffs)
• src/OgreOcclusionQueriesQueryManager.cpp (modified) (1 diff)

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

@@ -96 +96 @@
         void renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup,
                 QueuedRenderableCollection::OrganisationMode om);
-        void loadVisibilityConfig(const String& filename);
+        
         /** Override standard function so octree boxes are always of equal side length.
                 This has advantages for CHC, because terrain tiles are in different octree nodes
@@ -124 +124 @@
         */
         void InitVisibilityCulling(Camera *cam);
-
+#if 0
         /** Finds object corresponding to this bounding box in the scene.
         */
@@ -133 +133 @@
         */
         void IdentifyObjects(GtpVisibilityPreprocessor::ObjectContainer &objects);
-
+#endif
         /** Loads / unloads pvs of the view cell to set the visibility in the scene.
         */

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -180 +180 @@
                                 Filter="h;hpp;hxx;hm;inl;inc">
                                 <File
+                                        RelativePath="..\include\OgreBoundingBoxConverter.h">
+                                </File>
+                                <File
                                         RelativePath="..\include\OgreMeshInstance.h">
                                 </File>
@@ -216 +219 @@
                                 Name="Source Files"
                                 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+                                <File
+                                        RelativePath="..\src\OgreBoundingBoxConverter.cpp">
+                                </File>
                                 <File
                                         RelativePath="..\src\OgreMeshInstance.cpp">

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

@@ -19 +19 @@
 #include "OgreMeshInstance.h"
 #include "common.h"
+#include "OgreBoundingBoxConverter.h"
 
 // normal terrain rendering
@@ -998 +999 @@
    else
    {
-           SceneManager::renderModulativeStencilShadowedQueueGroupObjects(pGroup, om);
+           OctreeSceneManager::renderModulativeStencilShadowedQueueGroupObjects(pGroup, om);
    }
 }
@@ -1013 +1014 @@
         }
 }
-//-------------------------------------------------------------------------
-void OcclusionCullingSceneManager::loadVisibilityConfig(const String& filename)
-{
-        // TODO matt
-        // Set up the options
-        ConfigFile config;
-        String val;
-
-        config.load(filename);
-
-        val = config.getSetting("Algorithm");
-
-    if (!val.empty())
-        {
-                 VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).setOption("Algorithm", val.c_str());
-        }
-
-        val = config.getSetting("UseDepthPass");
-
-        if (!val.empty())
-        {
-                 setOption("UseDepthPass", val.c_str());
-        }
-}
-//-------------------------------------------------------------------------
-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 *OcclusionCullingSceneManager::FindCorrespondingObject(const AxisAlignedBox &box)
-{
-        list<SceneNode *> sceneNodeList;
-        AxisAlignedBox mybox = EnlargeBox(box);
-        //AxisAlignedBox dummy(Vector3(-50000, -50000, -50000), Vector3(50000, 50000, 50000));
-        
-        // get intersecting scene nodes
-        findNodesIn(mybox, sceneNodeList, NULL);
-        
-
-        list<SceneNode *>::const_iterator sit, sit_end = sceneNodeList.end();
-
-        float overlap = 0;//GtpVisibilityPreprocessor::Limits::Small;
-
-        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, eraly 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;
-}
 //-----------------------------------------------------------------------
 void OcclusionCullingSceneManager::LoadViewCells(string filename)
@@ -1124 +1020 @@
         SetObjectsVisible(false);
 
-        // identify the corresponding Ogre meshes using the bounding boxes
-        IdentifyObjects(mObjects);
+        const string bboxesFilename = mVisibilityManager->GetVisibilityEnvironment()->getViewCellsFileName();
+
+        GtpVisibilityPreprocessor::IndexedBoundingBoxContainer iboxes;
+        OgreBoundingBoxConverter bconverter(this);
 
         // load the view cells assigning the found objects to the pvss
         mViewCellsManager = 
-                GtpVisibilityPreprocessor::ViewCellsManager::LoadViewCells(filename, &mObjects);
+                GtpVisibilityPreprocessor::ViewCellsManager::LoadViewCells(filename, &mObjects, &bconverter);
 
         std::stringstream d;
         d << "view cells loaded" << endl;
         Ogre::LogManager::getSingleton().logMessage(d.str());
-}
-//-----------------------------------------------------------------------
-void OcclusionCullingSceneManager::IdentifyObjects(GtpVisibilityPreprocessor::ObjectContainer &objects)
-{
-        const string bboxesFilename = "boxes.out";
-
-        GtpVisibilityPreprocessor::IndexedBoundingBoxContainer iboxes;
-        mViewCellsManager->LoadBoundingBoxes(bboxesFilename, iboxes);
-
-        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);
-        }
 }
 //-------------------------------------------------------------------------

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

@@ -20 +20 @@
 //-----------------------------------------------------------------------
 void OcclusionQueriesQueryManager::ComputeCameraVisibility(const Camera &camera,
-                            GtpVisibility::NodeInfoContainer *visibleNodes,
-                            GtpVisibility::MeshInfoContainer *visibleGeometry,
-                                GtpVisibility::PatchInfoContainer *visiblePatches,
-                            bool relativeVisibility)
+                                                                                                                   GtpVisibility::NodeInfoContainer *visibleNodes,
+                                                                                                                   GtpVisibility::MeshInfoContainer *visibleGeometry,
+                                                                                                                   GtpVisibility::PatchInfoContainer *visiblePatches,
+                                                                                                                   bool relativeVisibility)
 {
         // we need access to the scene manager and the rendersystem