Changeset 2244

Timestamp:

Nov 21, 2008, 12:36:23 AM (16 years ago)

Author:

rgrieder

Message:

Applied long created patch that removes plugins.cfg and puts the content into orxonox.ini
This also allows to specify the media path for each 'distribution' individually because orxonox.ini has been added to the default files.

Location:

code/branches/buildsystem

Files:

• bin/CMakeLists.txt (modified) (3 diffs)
• bin/linux/orxonox.ini (moved) (moved from code/branches/buildsystem/bin/linux/plugins.cfg) (1 diff)
• bin/mingw/orxonox.ini (moved) (moved from code/branches/buildsystem/bin/mingw/plugins.cfg) (1 diff)
• bin/tardis/orxonox.ini (moved) (moved from code/branches/buildsystem/bin/tardis/plugins.cfg) (1 diff)
• src/orxonox/gamestates/GSGraphics.cc (modified) (4 diffs)
• src/orxonox/gamestates/GSGraphics.h (modified) (2 diffs)
• src/orxonox/gamestates/GSRoot.cc (modified) (1 diff)
• src/util/String.cc (modified) (1 diff)
• src/util/String.h (modified) (1 diff)

code/branches/buildsystem/bin/CMakeLists.txt

@@ -10 +10 @@
   SET(CONFIG_FILES ${CONFIG_FILES}
     linux/run-script
-        tardis/plugins.cfg
+        tardis/orxonox.ini
   )
 
@@ -16 +16 @@
   SET(CONFIG_FILES ${CONFIG_FILES}
     linux/run-script
-        linux/plugins.cfg
+        linux/orxonox.ini
   )
 ENDIF(IS_TARDIS)
@@ -22 +22 @@
 IF(MINGW)
   SET(CONFIG_FILES ${CONFIG_FILES}
-    "mingw/plugins.cfg"
+    "mingw/orxonox.ini"
     "mingw/orxonox.bat"
   )

code/branches/buildsystem/bin/linux/orxonox.ini

@@ -1 @@
-# Defines plugins to load
+[Settings]
+dataPath_ = ../../../media/
 
-# Define plugin folder
-PluginFolder=/usr/lib/OGRE
-
-# Define plugins
-#Plugin=RenderSystem_Direct3D9
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_CgProgramManager
-#Plugin=Plugin_BSPSceneManager
-#Plugin=Plugin_OctreeSceneManager
-
-
+[GSGraphics]
+ogrePluginsFolder_ = /usr/lib/OGRE
+ogrePlugins_ = RenderSystem_GL, Plugin_ParticleFX, Plugin_CgProgramManager #,Plugin_BSPSceneManager, Plugin_OctreeSceneManager

code/branches/buildsystem/bin/mingw/orxonox.ini

@@ -1 @@
-# Defines plugins to load
+[Settings]
+dataPath_ = ../../../media/
 
-# Define plugin folder
-PluginFolder=..\..\libs\ogre\Samples\Common\bin\Release\
-
-# Define plugins
-Plugin=RenderSystem_Direct3D9
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_CgProgramManager
-#Plugin=Plugin_BSPSceneManager
-#Plugin=Plugin_OctreeSceneManager
-
+[GSGraphics]
+ogrePluginsFolder_ = ..\..\libs\ogre\Samples\Common\bin\Release\
+ogrePlugins_ = RenderSystem_Direct3D9, RenderSystem_GL, Plugin_ParticleFX, Plugin_CgProgramManager #,Plugin_BSPSceneManager, Plugin_OctreeSceneManager

code/branches/buildsystem/bin/tardis/orxonox.ini

@@ -1 @@
-# Defines plugins to load
+[Settings]
+dataPath_ = ../../../media/
 
-# Define plugin folder
-PluginFolder=/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/
-
-# Define plugins
-#Plugin=RenderSystem_Direct3D9
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_CgProgramManager
-#Plugin=Plugin_BSPSceneManager
-#Plugin=Plugin_OctreeSceneManager
-
-
+[GSGraphics]
+ogrePluginsFolder_ = /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/
+ogrePlugins_ = RenderSystem_GL, Plugin_ParticleFX, Plugin_CgProgramManager #,Plugin_BSPSceneManager, Plugin_OctreeSceneManager

code/branches/buildsystem/src/orxonox/gamestates/GSGraphics.cc

@@ -43 +43 @@
 #include "util/Debug.h"
 #include "util/Exception.h"
+#include "util/String.h"
+#include "util/SubString.h"
 #include "core/ConsoleCommand.h"
 #include "core/ConfigValueIncludes.h"
@@ -82 +84 @@
     {
         SetConfigValue(resourceFile_, "resources.cfg").description("Location of the resources file in the data path.");
+        SetConfigValue(ogrePluginsFolder_, ".").description("Folder where the Ogre plugins are located.");
+        SetConfigValue(ogrePlugins_, "RenderSystem_GL, Plugin_ParticleFX").description("Comma separated list of all plugins to load.");
         SetConfigValue(statisticsRefreshCycle_, 200000).description("Sets the time in microseconds interval at which average fps, etc. get updated.");
     }
@@ -93 +97 @@
         this->ogreRoot_ = getParent()->getOgreRoot();
 
+        // load all the required plugins for Ogre
+        loadOgrePlugins();
+        // read resource declaration file
         this->declareResources();
-        this->loadRenderer();    // creates the render window
+        // Reads ogre config and creates the render window
+        this->loadRenderer();
+
         // TODO: Spread this so that this call only initialises things needed for the Console and GUI
         this->initialiseResources();
@@ -232 +241 @@
 
         ++frameCount_;
+    }
+
+    void GSGraphics::loadOgrePlugins()
+    {
+        // just to make sure the next statement doesn't segfault
+        if (ogrePluginsFolder_ == "")
+            ogrePluginsFolder_ = ".";
+
+#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+        convertToWindowsPath(&ogrePluginsFolder_);
+#else
+        convertToUnixPath(&ogrePluginsFolder_);
+#endif
+
+        // Do some SubString magic to get the comma separated list of plugins
+        SubString plugins(ogrePlugins_, ",", " ", false, 92, false, 34, false, 40, 41, false, '\0');
+        for (unsigned int i = 0; i < plugins.size(); ++i)
+            ogreRoot_->loadPlugin(ogrePluginsFolder_ + plugins[i]);
     }
 

code/branches/buildsystem/src/orxonox/gamestates/GSGraphics.h

@@ -56 +56 @@
         void setConfigValues();
 
+        void loadOgrePlugins();
         void declareResources();
         void loadRenderer();
@@ -88 +89 @@
         // config values
         std::string           resourceFile_;          //!< resources file name
+        std::string           ogrePluginsFolder_;     //!< Folder where the Ogre plugins are located
+        std::string           ogrePlugins_;           //!< Comma separated list of all plugins to load
         unsigned int          detailLevelParticle_;   //!< Detail level of particle effects (0: off, 1: low, 2: normal, 3: high)
     };

code/branches/buildsystem/src/orxonox/gamestates/GSRoot.cc

@@ -286 +286 @@
             probe.close();
 
-        ogreRoot_ = new Ogre::Root(ogrePluginsFile_, ogreConfigFile_, ogreLogFile_);
+        // Leave plugins file empty. We're going to do that part manually later
+        ogreRoot_ = new Ogre::Root("", ogreConfigFile_, ogreLogFile_);
 
 #if 0 // Ogre 1.4.3 doesn't yet support setDebugOutputEnabled(.)

code/branches/buildsystem/src/util/String.cc

@@ -485 +485 @@
     return std::string::npos;
 }
+
+/**
+    @brief Converts a path string to windows with "\" instead of "/".
+    @param str String pointer to be manipulated
+*/
+void convertToWindowsPath(std::string* str)
+{
+    std::string& path = *str;
+    // replace all occurences of "/" with "\"
+    for (unsigned int i = 0; i < path.length(); ++i)
+    {
+        if (path[i] == '/')
+            path[i] = '\\';
+    }
+    // add an extra '\\' at the end to make it a complete path
+    if (path != "" && path[path.length() - 1] != '\\')
+        path.append("\\");
+}
+
+/**
+    @brief Converts a path string to unix with "/" instead of "\".
+    @param str String pointer to be manipulated
+*/
+void convertToUnixPath(std::string* str)
+{
+    std::string& path = *str;
+    // replace all occurences of "\" with "/"
+    for (unsigned int i = 0; i < path.length(); ++i)
+    {
+        if (path[i] == '\\')
+            path[i] = '/';
+    }
+    // add an extra '\\' at the end to make it a complete path
+    if (path != "" && path[path.length() - 1] != '/')
+        path.append("/");
+}

code/branches/buildsystem/src/util/String.h

@@ -77 +77 @@
 _UtilExport unsigned int getNextCommentPosition(const std::string& str, unsigned int start = 0);
 
+_UtilExport void         convertToWindowsPath(std::string* str);
+_UtilExport void         convertToUnixPath(std::string* str);
+
 #endif /* _Util_String_H__ */