Changeset 1003

Timestamp:

06/07/06 13:56:08 (18 years ago)

Author:

mattausch

Message:

added collada importer

Location:

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE

Files:

• TestCullingTerrain.vcproj (modified) (2 diffs)
• TestCullingTerrainApplication.cpp (modified) (4 diffs)
• TestCullingTerrainApplication.h (modified) (1 diff)

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrain.vcproj

@@ -73 +73 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;&quot;$(LIBXML_HOME)\include&quot;"
+                                AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;&quot;$(LIBXML_HOME)\include&quot;;d:\work\Collada\include"
                                 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE"
                                 RuntimeLibrary="2"
@@ -85 +85 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="OGREMain.LIB CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib IVReader.lib zdll.lib zziplib.lib"
+                                AdditionalDependencies="OGREMain.LIB CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib IVReader.lib zdll.lib zziplib.lib Plugin_Collada.lib"
                                 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;..\..\Ogre\lib\$(ConfigurationName)&quot;;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib;&quot;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\$(ConfigurationName)&quot;;&quot;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)&quot;"
+                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;..\..\Ogre\lib\$(ConfigurationName)&quot;;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib;&quot;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\$(ConfigurationName)&quot;;&quot;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)&quot;;d:\work\Collada\bin\release"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="2"

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp

@@ -329 +329 @@
 }
 //-----------------------------------------------------------------------
-bool TestCullingTerrainApplication::LoadSceneIV(const String &filename, 
-                                                                                                SceneNode *root, 
-                                                                                                const int index)
+bool TestCullingTerrainApplication::LoadSceneCollada(const String &filename, 
+                                                                                                         SceneNode *root, 
+                                                                                                         const int index)
 {
         // Collada
-#if 1
         ColladaDocument *daeDoc = new ColladaDocument(mSceneMgr);
 
-        String daeName = strCmdLine;
-        if (daeName.empty()) 
-                daeName = "cube.dae";
+        String daeName = filename;
+        //if (daeName.empty()) 
+        //      daeName = "City_1500.dae";
 
         // default directory
-        daeName.insert(0, "../../media/models/collada/");
+        //daeName.insert(0, "../../media/models/collada/City");
         LogManager::getSingleton().logMessage("ColladaDocument - import started");
-        
+
         // full import
         if (daeDoc->doImport(daeName))
@@ -358 +357 @@
                  */
                 daeDoc->getScene()->createOgreInstance(NULL);
-        }
-
-        LogManager::getSingleton().logMessage("ColladaDocument - import finished");
-        // everything is loaded, we do not need the collada document anymore
-        delete daeDoc;
-#else
+
+                // everything is loaded, we do not need the collada document anymore
+                delete daeDoc;
+
+                return true;
+        }
+        else
+        {
+                LogManager::getSingleton().logMessage("ColladaDocument - import failed");
+                return false;
+        }
+
+        return true;
+}
+//-----------------------------------------------------------------------
+bool TestCullingTerrainApplication::LoadSceneIV(const String &filename, 
+                                                                                                SceneNode *root, 
+                                                                                                const int index)
+{
+
 
 
@@ -404 +417 @@
                 return true;
         }
-#endif
 
         return false;
@@ -756 +768 @@
                         LoadSceneIV(fn, mSceneMgr->getRootSceneNode(), i);                      
                 }
-                else if (strstr(filename.c_str(), ".collada"))
+                else if (strstr(filename.c_str(), ".dae"))
                 {
                         // load collada files
-                }
-                else if (filename == "terrain")
+                        // load iv files
+                        LoadSceneCollada(fn, mSceneMgr->getRootSceneNode(), i);         
+                }
+                else //if (filename == "terrain")
                 {
                         // terrain hack

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.h

@@ -128 +128 @@
         bool LoadSceneIV(const String &filename, SceneNode *root, const int index);
 
+        bool LoadSceneCollada(const String &filename, SceneNode *root, const int index);
+
         bool LoadScene(const String &filename);