Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6259 for code/branches


Ignore:
Timestamp:
Dec 6, 2009, 8:16:04 PM (15 years ago)
Author:
scheusso
Message:

menu automatically reads ogre config path

Location:
code/branches/presentation2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua

    r6258 r6259  
    1313
    1414function P:init()
    15     file = "C:\\Games\\Orxonox\\menu\\build\\config\\Debug\\" .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_")
     15    file = orxonox.PathConfig:getConfigPathString() .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_")
     16    --file = "C:\\Games\\Orxonox\\menu\\build\\config\\Debug\\" .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_")
    1617    search_mode = 0
    1718    f = io.open(file, "r")
  • code/branches/presentation2/src/libraries/core/CMakeLists.txt

    r6243 r6259  
    9090    Loader.h
    9191    LuaState.h
     92    PathConfig.h
    9293    input/InputManager.h
    9394    input/KeyBinder.h
  • code/branches/presentation2/src/libraries/core/PathConfig.h

    r5929 r6259  
    3636#include "util/Singleton.h"
    3737
     38//tolua_begin
    3839namespace orxonox
    3940{
     41//tolua_end
    4042    /**
    4143    @brief
     
    5052        - externalData only for development builds in the build tree
    5153    */
    52     class _CoreExport PathConfig : public Singleton<PathConfig>
    53     {
     54    class _CoreExport PathConfig //tolua_export
     55        : public Singleton<PathConfig>
     56    { //tolua_export
    5457        friend class Singleton<PathConfig>;
    5558        friend class Core;
     
    99102            static std::string getExternalDataPathString();
    100103            //! Returns the path to the config files as std::string
    101             static std::string getConfigPathString();
     104            static std::string getConfigPathString(); //tolua_export
    102105            //! Returns the path to the log files as std::string
    103106            static std::string getLogPathString();
     
    132135            bool                     bDevRun_;               //!< True for runs in the build directory (not installed)
    133136            static PathConfig* singletonPtr_s;
    134     };
    135 }
     137    }; //tolua_export
     138} //tolua_export
    136139
    137140#endif /* _PathConfig_H__ */
Note: See TracChangeset for help on using the changeset viewer.