Changeset 191

Timestamp:

Jan 11, 2011, 10:10:59 AM (14 years ago)

Author:

Torben Dannhauer

Message:

animationpath is now configurable by XML

Location:

osgVisual/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/osgVisualConfig.xml (modified) (1 diff)
• bin/visual_master.bat (modified) (1 diff)
• bin/visual_standalone.bat (modified) (1 diff)
• include/util/visual_util.h (modified) (1 diff)
• src/core/visual_core.cpp (modified) (1 diff)

osgVisual/trunk/CMakeLists.txt

@@ -374 +374 @@
         SET(USERFILE_COMMAND_DEBUG "$(TargetPath)" CACHE STRING "Command to execute on debugging (VS Project settings)" )
         SET(USERFILE_WORKING_DIRECTORY_DEBUG "bin" CACHE STRING "Working directory on debugging (VS Project settings)" )
-        SET(USERFILE_COMMAND_ARGUMENTS_DEBUG " --window 100 100 800 600 D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive -p salzburg.path --config osgVisualConfig.xml" CACHE STRING "Command arguments (VS Project settings)" )
+        SET(USERFILE_COMMAND_ARGUMENTS_DEBUG " --window 100 100 800 600 D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive --config osgVisualConfig.xml" CACHE STRING "Command arguments (VS Project settings)" )
         SET(USERFILE_REMOTE_MACHINE_DEBUG ${USER_NAME} CACHE STRING "Remote Debugging Machine (VS Project settings)")
         IF (DESTINATION_ARCH STREQUAL "x64")

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -39 +39 @@
   <scenery>
     <terrain filename="d:\my\path\database.ive"></terrain>
-    <animationpath filename="salzburgerEcke.path"></animationpath>
+    <animationpath filename="salzburg.path"></animationpath>
     <models>
       <model filename="cessna" type="plain" label="TestText!" dynamic="yes">

osgVisual/trunk/bin/visual_master.bat

@@ -1 @@
-osgVisual.exe -c osgVisualconfig.xml -C center --window 950 50 600 350 J:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive -p salzburg.path
+osgVisual.exe -c osgVisualconfig.xml -C center --window 950 50 600 350 J:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive

osgVisual/trunk/bin/visual_standalone.bat

@@ -1 @@
-osgVisual.exe -C center  --window 100 100 800 600 J:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive -p watzmann.path
+osgVisual.exe -C center  --window 100 100 800 600 J:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive

osgVisual/trunk/include/util/visual_util.h

@@ -253 +253 @@
         static xmlNode* getSceneryXMLConfig(std::string configFilename, xmlDoc*& doc);
 
+        /**
+         * \brief This function returns the path of the terrainfile specified in the configuration file.
+         * 
+         * @param configFilename : Filename of the XML configuration file.
+         * @return : On error an empty string, otherwise the terrain path specified in the configuration file.
+         */ 
         static std::string getTerrainFromXMLConfig(std::string configFilename);
 
+        /**
+         * \brief This function returns the path of the animationpath file specified in the configuration file.
+         * 
+         * @param configFilename : Filename of the XML configuration file.
+         * @return : On error an empty string, otherwise the path of the animationpath specified in the configuration file.
+         */ 
         static std::string getAnimationPathFromXMLConfig(std::string configFilename);
 

osgVisual/trunk/src/core/visual_core.cpp

@@ -231 +231 @@
 
                 // Animation path manipulator
-        std::string pathfile;
+                std::string pathfile = util::getAnimationPathFromXMLConfig(configFilename);
         char keyForAnimationPath = '8';
-        while (arguments.read("-p",pathfile))
+                if( pathfile != "" )
         {
             osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);