Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7968


Ignore:
Timestamp:
Feb 26, 2011, 5:23:49 PM (13 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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/kicklib/src/libraries/core/GUIManager.cc

    r7967 r7968  
    4646#include <elements/CEGUIListboxItem.h>
    4747
    48 #ifdef CEGUI_OLD_VERSION
     48#ifdef ORXONOX_OLD_CEGUI
    4949#  include <CEGUILua.h>
    5050#  include <ogreceguirenderer/OgreCEGUIRenderer.h>
     
    127127        , guiSystem_(NULL)
    128128        , resourceProvider_(NULL)
    129 #ifdef CEGUI_OLD_VERSION
     129#ifndef ORXONOX_OLD_CEGUI
    130130        , imageCodec_(NULL)
    131131#endif
     
    140140
    141141        // Note: No SceneManager specified yet
    142 #ifdef CEGUI_OLD_VERSION
     142#ifdef ORXONOX_OLD_CEGUI
    143143        guiRenderer_ = new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000);
    144144        resourceProvider_ = guiRenderer_->createResourceProvider();
     
    155155        // This is necessary to ensure that input events also use the right resource info when triggering lua functions
    156156        luaState_->setDefaultResourceInfo(this->rootFileInfo_);
    157 #ifdef CEGUI_OLD_VERSION
     157#ifdef ORXONOX_OLD_CEGUI
    158158        scriptModule_ = new LuaScriptModule(luaState_->getInternalLuaState());
    159159#else
     
    171171
    172172        // Create the CEGUI system singleton
    173 #ifdef CEGUI_OLD_VERSION
     173#ifdef ORXONOX_OLD_CEGUI
    174174        guiSystem_ = new System(guiRenderer_, resourceProvider_, 0, scriptModule_);
    175175        // Add functions that have been renamed in newer versions
     
    207207        using namespace CEGUI;
    208208
    209 #ifdef CEGUI_OLD_VERSION
     209#ifdef ORXONOX_OLD_CEGUI
    210210        delete guiSystem_;
    211211        delete guiRenderer_;
     
    260260    {
    261261        this->camera_ = camera;
    262 #ifdef CEGUI_OLD_VERSION
     262#ifdef ORXONOX_OLD_CEGUI
    263263        if (camera == NULL)
    264264            this->guiRenderer_->setTargetSceneManager(0);
     
    551551    void GUIManager::windowResized(unsigned int newWidth, unsigned int newHeight)
    552552    {
    553 #ifdef CEGUI_OLD_VERSION
     553#ifdef ORXONOX_OLD_CEGUI
    554554        this->guiRenderer_->setDisplaySize(CEGUI::Size(newWidth, newHeight));
    555555#else
  • code/branches/kicklib/src/libraries/core/GUIManager.h

    r7967 r7968  
    5959
    6060#if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7
    61 #  define CEGUI_OLD_VERSION
     61#  define ORXONOX_OLD_CEGUI
    6262#endif
    6363
     
    153153        Loki::ObjScopeGuardImpl0<GUIManager, void (GUIManager::*)()> destroyer_;
    154154
    155 #ifdef CEGUI_OLD_VERSION
     155#ifdef ORXONOX_OLD_CEGUI
    156156        CEGUI::OgreCEGUIRenderer*            guiRenderer_;      //!< CEGUI's interface to the Ogre Engine
    157157        CEGUI::ResourceProvider*             resourceProvider_; //!< CEGUI's resource provider
     
    161161        CEGUI::OgreResourceProvider*         resourceProvider_; //!< CEGUI's resource provider
    162162        CEGUI::OgreImageCodec*               imageCodec_;
    163         static const bool                    CEGUIVERSION7 = false;
     163        static const bool                    CEGUIVERSION7 = true;
    164164#endif
    165165        LuaState*                            luaState_;         //!< LuaState, access point to the Lua engine
Note: See TracChangeset for help on using the changeset viewer.