Changeset 944 for GTP/trunk/Lib/Vis/OnlineCullingCHC

Timestamp:

05/10/06 18:33:35 (19 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/src/OgreBoundingBoxConverter.cpp (modified) (2 diffs)
• OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (8 diffs)
• OGRE/src/OgreOctreeHierarchyInterface.cpp (modified) (2 diffs)
• OGRE/src/OgrePlatformOcclusionQuery.cpp (modified) (1 diff)
• src/VisibilityEnvironment.cpp (modified) (1 diff)

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);
 
@@ -53 +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);

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

@@ -168 +168 @@
     }
         // add bounding boxes of rendered objects
-        if (1)
+        if (0)
         for (BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it)
         {
@@ -561 +561 @@
                 if (mViewCellsLoaded)
                 {
-                        LogManager::getSingleton().logMessage("here3");
                         mUseViewCells = *static_cast<const bool *>(val);
 
@@ -1014 +1013 @@
                 OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(*it);
                 Entity *ent = omi->GetMesh();
-                LogManager::getSingleton().logMessage("here999");
+                
                 ent->setVisible(visible);
         }
@@ -1036 +1035 @@
         // load the view cells assigning the found objects to the pvss
         mViewCellsManager = 
-                GtpVisibilityPreprocessor::ViewCellsManager::LoadViewCells(filename, &mObjects, env, &bconverter);
+                GtpVisibilityPreprocessor::ViewCellsManager::LoadViewCells(filename, &mObjects, env, false, &bconverter);
 
         if (!mViewCellsManager)
@@ -1055 +1054 @@
                 // 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();
@@ -1069 +1068 @@
                 OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance*>((*oit).first);
                 omi->GetMesh()->setVisible(load);
-                GtpVisibilityPreprocessor::Debug << "here45 " << omi->GetId() << endl;
+                //GtpVisibilityPreprocessor::Debug << "assigned id " << omi->GetId() << endl;
         }
 }
@@ -1089 +1088 @@
 
         mElementaryViewCell = newElementary;
-        LogManager::getSingleton().logMessage("unloading");
+        //LogManager::getSingleton().logMessage("unloading");
         //-- unload old pvs
         applyViewCellPvs(mCurrentViewCell, false);
@@ -1110 +1109 @@
                 viewCell = newElementary;
         }
-        LogManager::getSingleton().logMessage("loading");
+        //LogManager::getSingleton().logMessage("loading");
         //-- load new pvs
-        if (0)applyViewCellPvs(viewCell, true);
+        applyViewCellPvs(viewCell, true);
 
         // store pvs

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

@@ -54 +54 @@
 {
         Octree *octree = static_cast<Octree *>(node);
+
         // HACK: if there are subtrees, they are empty => we are not interested in them
         return octree->numNodes() == (int)octree->mNodes.size();
@@ -70 +71 @@
         const Vector3 pos = (bmax - bmin) * 0.5 + bmin;
         
+/*      std::stringstream d; 
+        d << "a: " << (mCameraPosition - pos).squaredLength() 
+          << " b: " << (mCullCamera->getDerivedPosition() - pos).squaredLength();
+        LogManager::getSingleton().logMessage(d.str());*/
         return (mCameraPosition - pos).squaredLength();
-        //return (mCullCamera->getDerivedPosition() - pos).squaredLength();
 }
 //-----------------------------------------------------------------------

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

@@ -12 +12 @@
 PlatformOcclusionQuery::~PlatformOcclusionQuery()
 {
+        // hardwareocclusion query is deleted by Ogre
         //delete mHardwareOcclusionQuery;
 }

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/VisibilityEnvironment.cpp

@@ -32 +32 @@
         argv[1] = fname;
 
-        GtpVisibilityPreprocessor::Debug << "here4 loading environment from: " << argv[1] << endl;
+        GtpVisibilityPreprocessor::Debug << "loading environment from: " << argv[1] << endl;
+        return GtpVisibilityPreprocessor::environment->Parse(argc, argv, false);
 */
-                //-- parse environment
+        //-- parse environment
         return mEnvironment->ReadEnvFile(filename.c_str());
-        //return GtpVisibilityPreprocessor::environment->Parse(argc, argv, false);
 }
 //-----------------------------------------------------------------------