Changeset 2119 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

Timestamp:

02/15/07 14:45:30 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (5 diffs)

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

@@ -23 +23 @@
 #include "IntersectableWrapper.h"
 #include "IVReader.h"
+#include "ObjReader.h"
+
 
 
@@ -154 +156 @@
 
         // load the scene
-        LoadScene(mFilename);
-        
-        // load view cells
-        //mViewCellsLoaded = LoadViewCells(mViewCellsFilename);
+        LoadScene(mFilename, mViewCellsFilename);
+        
+        // load view cells: load later ...
+        if (0) mViewCellsLoaded = LoadViewCells(mViewCellsFilename);
 
         if (mShowTerrain)
@@ -1592 +1594 @@
 }
 //-----------------------------------------------------------------------
-bool OcclusionCullingSceneManager::LoadScene(const String &filename)
+bool OcclusionCullingSceneManager::LoadScene(const String &filename, 
+                                                                                         const String &viewCellsFilename)
 {
         using namespace std;
@@ -1620 +1623 @@
                 const string fn = *fit;
 
-                if (strstr(fn.c_str(), ".iv") || strstr(fn.c_str(), ".wrl"))
+                if (strstr(fn.c_str(), ".obj"))
+                {
+                        // load iv files
+                        if (!LoadSceneObj(filename, viewCellsFilename, getRootSceneNode()))
+                        {
+                                LogManager::getSingleton().logMessage("error loading file");
+                                return false;
+            }
+                }
+                else if (strstr(fn.c_str(), ".iv") || strstr(fn.c_str(), ".wrl"))
                 {
                         // load iv files
@@ -1682 +1694 @@
 }
 //-----------------------------------------------------------------------
+bool OcclusionCullingSceneManager::LoadSceneObj(const String &filename,
+                                                                                                const String &viewCellsFile,
+                                                                                                SceneNode *root)
+{
+        ObjReader objReader(this);
+
+        Timer *timer = PlatformManager::getSingleton().createTimer();
+        timer->reset();
+
+        if (!objReader.LoadFile(filename.c_str(), viewCellsFile, root))
+        {
+                PlatformManager::getSingleton().destroyTimer(timer);
+                return false;
+        }
+
+        SceneNode *node = root->createChildSceneNode("ObjSceneNode");
+
+        std::stringstream d; 
+        d << "loaded " << filename << " in " << timer->getMilliseconds() * 1e-3 << " secs";
+        LogManager::getSingleton().logMessage(d.str());
+                
+        PlatformManager::getSingleton().destroyTimer(timer);
+
+        return true;
+}
+//-----------------------------------------------------------------------
 const String OcclusionCullingSceneManagerFactory::FACTORY_TYPE_NAME = "OcclusionCullingSceneManager";
 //-----------------------------------------------------------------------