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

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreOcclusionCullingSceneManager.h (modified) (1 diff)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (5 diffs)
• src/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)

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

@@ -142 +142 @@
         void VisualizeViewCells(const bool visualize);
 
+        /** Load an iv scene.
+        */
         bool LoadSceneIV(const String &filename, 
                                          SceneNode *root, 
                                          const int index);
 
-        bool LoadScene(const String &filename);
+        /** Load obj scene.
+        */
+        bool LoadSceneObj(const String &filename,
+                                          const String &viewCellsFile,
+                                          SceneNode *root);
+
+        /** Load a scene.
+        */
+        bool LoadScene(const String &filename, const String &viewCellsFilename);
 
         void loadConfig(DataStreamPtr& stream);

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";
 //-----------------------------------------------------------------------

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

@@ -89 +89 @@
                                 OptimizeForProcessor="3"
                                 OptimizeForWindowsApplication="TRUE"
-                                AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\Preprocessing\src\Timer"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE"
+                                AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\Preprocessing\src\Timer;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\include"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE1"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"
@@ -105 +105 @@
                                 Name="VCLinkerTool"
                                 IgnoreImportLibrary="TRUE"
-                                AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplib.lib Preprocessor.lib xerces-c_2.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib glew32.lib glew32s.lib IVReader.lib"
+                                AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplib.lib Preprocessor.lib xerces-c_2.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib glew32.lib glew32s.lib IVReader.lib ObjReader.lib"
                                 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll"
                                 Version="0.99"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-                                AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Zlib\lib;"..\..\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)""
+                                AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Zlib\lib;"..\..\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\lib\$(ConfigurationName)""
                                 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"
                                 GenerateDebugInformation="FALSE"