Changeset 191 for osgVisual/trunk


Ignore:
Timestamp:
Jan 11, 2011, 10:10:59 AM (13 years ago)
Author:
Torben Dannhauer
Message:

animationpath is now configurable by XML

Location:
osgVisual/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • osgVisual/trunk/CMakeLists.txt

    r183 r191  
    374374        SET(USERFILE_COMMAND_DEBUG "$(TargetPath)" CACHE STRING "Command to execute on debugging (VS Project settings)" )
    375375        SET(USERFILE_WORKING_DIRECTORY_DEBUG "bin" CACHE STRING "Working directory on debugging (VS Project settings)" )
    376         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)" )
     376        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)" )
    377377        SET(USERFILE_REMOTE_MACHINE_DEBUG ${USER_NAME} CACHE STRING "Remote Debugging Machine (VS Project settings)")
    378378        IF (DESTINATION_ARCH STREQUAL "x64")
  • osgVisual/trunk/bin/osgVisualConfig.xml

    r189 r191  
    3939  <scenery>
    4040    <terrain filename="d:\my\path\database.ive"></terrain>
    41     <animationpath filename="salzburgerEcke.path"></animationpath>
     41    <animationpath filename="salzburg.path"></animationpath>
    4242    <models>
    4343      <model filename="cessna" type="plain" label="TestText!" dynamic="yes">
  • osgVisual/trunk/bin/visual_master.bat

    r175 r191  
    1 osgVisual.exe -c osgVisualconfig.xml -C center --window 950 50 600 350 J:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive -p salzburg.path
     1osgVisual.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

    r123 r191  
    1 osgVisual.exe -C center  --window 100 100 800 600 J:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive -p watzmann.path
     1osgVisual.exe -C center  --window 100 100 800 600 J:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive
  • osgVisual/trunk/include/util/visual_util.h

    r190 r191  
    253253        static xmlNode* getSceneryXMLConfig(std::string configFilename, xmlDoc*& doc);
    254254
     255        /**
     256         * \brief This function returns the path of the terrainfile specified in the configuration file.
     257         *
     258         * @param configFilename : Filename of the XML configuration file.
     259         * @return : On error an empty string, otherwise the terrain path specified in the configuration file.
     260         */
    255261        static std::string getTerrainFromXMLConfig(std::string configFilename);
    256262
     263        /**
     264         * \brief This function returns the path of the animationpath file specified in the configuration file.
     265         *
     266         * @param configFilename : Filename of the XML configuration file.
     267         * @return : On error an empty string, otherwise the path of the animationpath specified in the configuration file.
     268         */
    257269        static std::string getAnimationPathFromXMLConfig(std::string configFilename);
    258270
  • osgVisual/trunk/src/core/visual_core.cpp

    r189 r191  
    231231
    232232                // Animation path manipulator
    233         std::string pathfile;
     233                std::string pathfile = util::getAnimationPathFromXMLConfig(configFilename);
    234234        char keyForAnimationPath = '8';
    235         while (arguments.read("-p",pathfile))
     235                if( pathfile != "" )
    236236        {
    237237            osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
Note: See TracChangeset for help on using the changeset viewer.