Changeset 7968

Timestamp:

Feb 26, 2011, 5:23:49 PM (14 years ago)

Author:

rgrieder

Message:

Starting an Orxonox macro with CEGUI is probably not such a good idea.
Also fixed two little bugs.

Location:

code/branches/kicklib/src/libraries/core

Files:

• GUIManager.cc (modified) (8 diffs)
• GUIManager.h (modified) (3 diffs)

code/branches/kicklib/src/libraries/core/GUIManager.cc

@@ -46 +46 @@
 #include <elements/CEGUIListboxItem.h>
 
-#ifdef CEGUI_OLD_VERSION
+#ifdef ORXONOX_OLD_CEGUI
 #  include <CEGUILua.h>
 #  include <ogreceguirenderer/OgreCEGUIRenderer.h>
@@ -127 +127 @@
         , guiSystem_(NULL)
         , resourceProvider_(NULL)
-#ifdef CEGUI_OLD_VERSION
+#ifndef ORXONOX_OLD_CEGUI
         , imageCodec_(NULL)
 #endif
@@ -140 +140 @@
 
         // Note: No SceneManager specified yet
-#ifdef CEGUI_OLD_VERSION
+#ifdef ORXONOX_OLD_CEGUI
         guiRenderer_ = new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000);
         resourceProvider_ = guiRenderer_->createResourceProvider();
@@ -155 +155 @@
         // This is necessary to ensure that input events also use the right resource info when triggering lua functions
         luaState_->setDefaultResourceInfo(this->rootFileInfo_);
-#ifdef CEGUI_OLD_VERSION
+#ifdef ORXONOX_OLD_CEGUI
         scriptModule_ = new LuaScriptModule(luaState_->getInternalLuaState());
 #else
@@ -171 +171 @@
 
         // Create the CEGUI system singleton
-#ifdef CEGUI_OLD_VERSION
+#ifdef ORXONOX_OLD_CEGUI
         guiSystem_ = new System(guiRenderer_, resourceProvider_, 0, scriptModule_);
         // Add functions that have been renamed in newer versions
@@ -207 +207 @@
         using namespace CEGUI;
 
-#ifdef CEGUI_OLD_VERSION
+#ifdef ORXONOX_OLD_CEGUI
         delete guiSystem_;
         delete guiRenderer_;
@@ -260 +260 @@
     {
         this->camera_ = camera;
-#ifdef CEGUI_OLD_VERSION
+#ifdef ORXONOX_OLD_CEGUI
         if (camera == NULL)
             this->guiRenderer_->setTargetSceneManager(0);
@@ -551 +551 @@
     void GUIManager::windowResized(unsigned int newWidth, unsigned int newHeight)
     {
-#ifdef CEGUI_OLD_VERSION
+#ifdef ORXONOX_OLD_CEGUI
         this->guiRenderer_->setDisplaySize(CEGUI::Size(newWidth, newHeight));
 #else

code/branches/kicklib/src/libraries/core/GUIManager.h

@@ -59 +59 @@
 
 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7
-#  define CEGUI_OLD_VERSION
+#  define ORXONOX_OLD_CEGUI
 #endif
 
@@ -153 +153 @@
         Loki::ObjScopeGuardImpl0<GUIManager, void (GUIManager::*)()> destroyer_;
 
-#ifdef CEGUI_OLD_VERSION
+#ifdef ORXONOX_OLD_CEGUI
         CEGUI::OgreCEGUIRenderer*            guiRenderer_;      //!< CEGUI's interface to the Ogre Engine
         CEGUI::ResourceProvider*             resourceProvider_; //!< CEGUI's resource provider
@@ -161 +161 @@
         CEGUI::OgreResourceProvider*         resourceProvider_; //!< CEGUI's resource provider
         CEGUI::OgreImageCodec*               imageCodec_;
-        static const bool                    CEGUIVERSION7 = false;
+        static const bool                    CEGUIVERSION7 = true;
 #endif
         LuaState*                            luaState_;         //!< LuaState, access point to the Lua engine