Changeset 2509 for code/branches/buildsystem2/src/orxonox

Timestamp:

Dec 17, 2008, 8:59:48 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (2 props)
• src/orxonox/CMakeLists.txt (modified) (4 diffs)
• src/orxonox/Settings.cc (modified) (1 diff)
• src/orxonox/gamestates/GSGraphics.cc (modified) (5 diffs)
• src/orxonox/gamestates/GSGraphics.h (modified) (2 diffs)
• src/orxonox/gui/GUIManager.cc (modified) (1 diff)
• src/orxonox/gui/GUIManager.h (modified) (1 diff)
• src/orxonox/tolua (deleted)

code/branches/buildsystem2/src/orxonox/CMakeLists.txt

@@ -6 +6 @@
   PlayerManager.cc
   Settings.cc
-  
-  tolua/tolua_bind.cc
 )
 
@@ -16 +14 @@
 ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES tools)
 
-GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h
-  COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
-  DEPENDS
-    tolua_orxonox
-    tolua/tolua.pkg
-    gui/GUIManager.h
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
-)
+INCLUDE(UseTolua)
+TOLUA(Orxonox ORXONOX_SRC_FILES INPUTFILES gui/GUIManager.h)
 
 
@@ -42 +32 @@
 
 TARGET_LINK_LIBRARIES( orxonox
-  ${OGRE_LIBRARIES}
-  ${CEGUI_LIBRARIES}
-  lua_orxonox
+  ${OGRE_LIBRARY}
+  ${CEGUI_LIBRARY}
+  ${LUA_LIBRARIES}
+  #${CEGUI_SCRIPT_LIBRARIES}
   ceguilua_orxonox
   tinyxml_orxonox
@@ -53 +44 @@
   network
 )
-

code/branches/buildsystem2/src/orxonox/Settings.cc

@@ -63 +63 @@
     void Settings::setConfigValues()
     {
-        SetConfigValue(dataPath_, "../../media/").description("Relative path to the game data.").callback(this, &Settings::dataPathChanged);
+        SetConfigValue(dataPath_, "../../../media/").description("Relative path to the game data.").callback(this, &Settings::dataPathChanged);
     }
 

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

@@ -44 +44 @@
 #include "util/Debug.h"
 #include "util/Exception.h"
+#include "util/String.h"
+#include "util/SubString.h"
 #include "core/ConsoleCommand.h"
 #include "core/ConfigValueIncludes.h"
@@ -96 +98 @@
         SetConfigValue(ogreConfigFile_,  "ogre.cfg")
             .description("Location of the Ogre config file");
-        SetConfigValue(ogrePluginsFile_, "plugins.cfg")
-            .description("Location of the Ogre plugins file");
+        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(ogreLogFile_,     "ogre.log")
             .description("Logfile for messages from Ogre. Use \"\" to suppress log file creation.");
@@ -121 +125 @@
         // Ogre setup procedure
         setupOgre();
+        // 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();
@@ -345 +354 @@
             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(.)
@@ -358 +368 @@
 
         COUT(3) << "Ogre set up done." << std::endl;
+    }
+
+    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/buildsystem2/src/orxonox/gamestates/GSGraphics.h

@@ -60 +60 @@
 
         void setupOgre();
+        void loadOgrePlugins();
         void declareResources();
         void loadRenderer();
@@ -105 +106 @@
         std::string           resourceFile_;             //!< resources file name
         std::string           ogreConfigFile_;           //!< ogre config file name
-        std::string           ogrePluginsFile_;          //!< ogre plugins file name
+        std::string           ogrePluginsFolder_;        //!< Folder where the Ogre plugins are located
+        std::string           ogrePlugins_;              //!< Comma separated list of all plugins to load
         std::string           ogreLogFile_;              //!< log file name for Ogre log messages
         int                   ogreLogLevelTrivial_;      //!< Corresponding Orxonx debug level for LL_TRIVIAL

code/branches/buildsystem2/src/orxonox/gui/GUIManager.cc

@@ -39 +39 @@
 #include <OgreRoot.h>
 #include <CEGUI.h>
-#include "ceguilua/CEGUILua.h"
+#include <CEGUILua.h>
 #include "util/Exception.h"
 #include "core/input/InputManager.h"
 #include "core/input/SimpleInputState.h"
-#include "core/tolua/tolua_bind.h"
 #include "core/ConsoleCommand.h"
 #include "core/Core.h"
-#include "tolua/tolua_bind.h"
+#include "core/ToluaBindCore.h"
+#include "orxonox/ToluaBindOrxonox.h"
 #include "OgreCEGUIRenderer.h"
 
-#include "lua/lua.hpp"
+extern "C" {
+#include "lua.h"
+}
 
 namespace orxonox

code/branches/buildsystem2/src/orxonox/gui/GUIManager.h

@@ -42 +42 @@
 #include "core/input/InputInterfaces.h"
 
-namespace orxonox // tolua_export
-{ // tolua_export
+// tolua_begin
+namespace orxonox
+{
     /**
     @brief
         Provides a simple interface to CEGUI with tolua methods and console commands
     */
-    class _OrxonoxExport GUIManager : public KeyHandler, public MouseHandler
-    /*
-    class GUIManager { // tolua_export
-    */
+    class _OrxonoxExport GUIManager
+// tolua_end
+        : public KeyHandler, public MouseHandler
+// tolua_begin
     {
+// tolua_end
     public:
         enum State