Changeset 2710 for code/trunk/src/orxonox/gui

Timestamp:

Feb 28, 2009, 7:46:37 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem3 containing buildsystem2 containing Adi's buildsystem branch back to the trunk.
Please update the media directory if you were not using buildsystem3 before.

Location:

code/trunk

Files:

• . (modified) (2 props)
• src/orxonox/gui/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gui/GUIManager.cc (modified) (3 diffs)
• src/orxonox/gui/GUIManager.h (modified) (2 diffs)
• src/orxonox/gui/OgreCEGUIRenderer.cpp (deleted)
• src/orxonox/gui/OgreCEGUIRenderer.h (deleted)
• src/orxonox/gui/OgreCEGUIResourceProvider.cpp (deleted)
• src/orxonox/gui/OgreCEGUIResourceProvider.h (deleted)
• src/orxonox/gui/OgreCEGUITexture.cpp (deleted)
• src/orxonox/gui/OgreCEGUITexture.h (deleted)

code/trunk/src/orxonox/gui/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   GUIManager.cc
-  OgreCEGUIRenderer.cpp
-  OgreCEGUIResourceProvider.cpp
-  OgreCEGUITexture.cpp
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -36 +36 @@
 #include "GUIManager.h"
 
+#include <boost/filesystem.hpp>
 #include <OgreRenderWindow.h>
 #include <OgreRoot.h>
 #include <CEGUI.h>
-#include "ceguilua/CEGUILua.h"
+#include <CEGUIDefaultLogger.h>
+#include <ogreceguirenderer/OgreCEGUIRenderer.h>
+#include "SpecialConfig.h" // Configures the macro below
+#ifdef CEGUILUA_USE_INTERNAL_LIBRARY
+#   include <ceguilua/CEGUILua.h>
+#else
+#   include <CEGUILua.h>
+#endif
+
 #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 "OgreCEGUIRenderer.h"
-
-#include "lua/lua.hpp"
+#include "ToluaBindCore.h"
+#include "ToluaBindOrxonox.h"
+
+extern "C" {
+#include <lua.h>
+}
 
 namespace orxonox
@@ -100 +110 @@
                 lua_pushnil(luaState_);
                 lua_setglobal(luaState_, "Core");
-            // TODO: deleting the script module fails an assertation.
+            // TODO: deleting the script module fails an assertion.
             // However there is not much we can do about it since it occurs too when
             // we don't open Core or Orxonox. Might be a CEGUI issue.
@@ -141 +151 @@
                 this->luaState_ = this->scriptModule_->getLuaState();
 
+                // Create our own logger to specify the filepath
+                boost::filesystem::path ceguiLogFilepath(Core::getLogPath() / "cegui.log");
+                this->ceguiLogger_ = new DefaultLogger();
+                this->ceguiLogger_->setLogFilename(ceguiLogFilepath.file_string());
+                // set the log level according to ours (translate by subtracting 1)
+                this->ceguiLogger_->setLoggingLevel(
+                    (LoggingLevel)(Core::getSoftDebugLevel(OutputHandler::LD_Logfile) - 1));
+
                 // create the CEGUI system singleton
                 this->guiSystem_ = new System(this->guiRenderer_, this->resourceProvider_, 0, this->scriptModule_);
-
-                // set the log level according to ours (translate by subtracting 1)
-                Logger::getSingleton().setLoggingLevel(
-                    (LoggingLevel)(Core::getSoftDebugLevel(OutputHandler::LD_Logfile) - 1));
 
                 // do this after 'new CEGUI::Sytem' because that creates the lua state in the first place

code/trunk/src/orxonox/gui/GUIManager.h

@@ -42 +42 @@
 #include "core/input/InputInterfaces.h"
 
-namespace orxonox // tolua_export
-{ // tolua_export
+// Forward declaration
+namespace CEGUI { class DefaultLogger; }
+
+// 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
@@ -117 +122 @@
         CEGUI::ResourceProvider*  resourceProvider_;
         CEGUI::LuaScriptModule*   scriptModule_;
+        CEGUI::DefaultLogger*     ceguiLogger_;
         CEGUI::System*            guiSystem_;
         CEGUI::Imageset*          backgroundImage_;