Changeset 2124 for GTP/trunk/Lib/Vis/OnlineCullingCHC/ObjReader

Timestamp:

02/19/07 02:51:22 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/ObjReader

Files:

• include/ObjMeshData.h (deleted)
• include/ObjNode.h (deleted)
• include/ObjReader.h (modified) (2 diffs)
• src/ObjMeshData.cpp (deleted)
• src/ObjNode.cpp (deleted)
• src/ObjReader.cpp (modified) (6 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/ObjReader/include/ObjReader.h

@@ -9 +9 @@
 namespace  GtpVisibilityPreprocessor {
 class Intersectable;
+class Preprocessor;
 }
 
@@ -31 +32 @@
         Ogre::SceneManager *mSceneManager;
         GtpVisibilityPreprocessor::ObjectContainer mPvsObjects;
+        GtpVisibilityPreprocessor::Preprocessor *mPreprocessor;
 };
 

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

@@ -13 +13 @@
 
 ObjReader::ObjReader(Ogre::SceneManager *sceneManager):
-mSceneManager(sceneManager)
-{}
+mSceneManager(sceneManager), mPreprocessor(NULL)
+{
+}
 
 
@@ -20 +21 @@
 {
         CLEAR_CONTAINER(mPvsObjects);
+        
+        DEL_PTR(mPreprocessor);
 }
 
@@ -29 +32 @@
         GtpVisibilityPreprocessor::Debug.open("debug.log");
         // HACK: get any preprocessor to load file
-        GtpVisibilityPreprocessor::Preprocessor *preprocessor = 
+        // note should be preserved to allow manual mesh reloading,
+        // but then geometry has to be stored two times
+        mPreprocessor = 
                 GtpVisibilityPreprocessor::PreprocessorFactory::CreatePreprocessor("vss");
 
         // hack
-        preprocessor->mLoadMeshes = false;
+        mPreprocessor->mLoadMeshes = false;
 
         Ogre::LogManager::getSingleton().logMessage("loading obj scene");
 
-        if (preprocessor->LoadScene(sceneName))
+        if (mPreprocessor->LoadScene(sceneName))
         {
                 Ogre::LogManager::getSingleton().logMessage("scene loaded, loading objects");
                 // form objects from the scene triangles
-                if (!preprocessor->LoadObjects(visibilitySolution, mPvsObjects, preprocessor->mObjects))
+                if (!mPreprocessor->LoadObjects(visibilitySolution, mPvsObjects, mPreprocessor->mObjects))
                 {
                         Ogre::LogManager::getSingleton().logMessage("objects cannot be loaded");
@@ -54 +59 @@
 
         std::stringstream d; 
-        d << "successfully loaded " << mPvsObjects.size() << " objects from " << preprocessor->mObjects.size() << " preprocessor objects";
+        d << "successfully loaded " << (int)mPvsObjects.size() 
+          << " objects from " << (int)mPreprocessor->mObjects.size() << " preprocessor objects";
 
         Ogre::LogManager::getSingleton().logMessage(d.str());
@@ -65 +71 @@
                 if (i % 5000 == 4999)
                 {
-                        d << i << " objects created" << endl;
+                        d << i << " objects created";
+                        Ogre::LogManager::getSingleton().logMessage(d.str());
                 }
         
@@ -84 +91 @@
         }
 
-        delete preprocessor;
+        //delete preprocessor;
 
         return true;