Changeset 6259

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:

• data/gui/scripts/GraphicsMenu.lua (modified) (1 diff)
• src/libraries/core/CMakeLists.txt (modified) (1 diff)
• src/libraries/core/PathConfig.h (modified) (4 diffs)

code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua

@@ -13 +13 @@
 
 function P:init()
-    file = "C:\\Games\\Orxonox\\menu\\build\\config\\Debug\\" .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_")
+    file = orxonox.PathConfig:getConfigPathString() .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_")
+    --file = "C:\\Games\\Orxonox\\menu\\build\\config\\Debug\\" .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_")
     search_mode = 0
     f = io.open(file, "r")

code/branches/presentation2/src/libraries/core/CMakeLists.txt

@@ -90 +90 @@
     Loader.h
     LuaState.h
+    PathConfig.h
     input/InputManager.h
     input/KeyBinder.h

code/branches/presentation2/src/libraries/core/PathConfig.h

@@ -36 +36 @@
 #include "util/Singleton.h"
 
+//tolua_begin
 namespace orxonox
 {
+//tolua_end
     /**
     @brief
@@ -50 +52 @@
         - externalData only for development builds in the build tree
     */
-    class _CoreExport PathConfig : public Singleton<PathConfig>
-    {
+    class _CoreExport PathConfig //tolua_export
+        : public Singleton<PathConfig>
+    { //tolua_export
         friend class Singleton<PathConfig>;
         friend class Core;
@@ -99 +102 @@
             static std::string getExternalDataPathString();
             //! Returns the path to the config files as std::string
-            static std::string getConfigPathString();
+            static std::string getConfigPathString(); //tolua_export
             //! Returns the path to the log files as std::string
             static std::string getLogPathString();
@@ -132 +135 @@
             bool                     bDevRun_;               //!< True for runs in the build directory (not installed)
             static PathConfig* singletonPtr_s;
-    };
-}
+    }; //tolua_export
+} //tolua_export
 
 #endif /* _PathConfig_H__ */