Changeset 7968
- Timestamp:
- Feb 26, 2011, 5:23:49 PM (14 years ago)
- Location:
- code/branches/kicklib/src/libraries/core
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib/src/libraries/core/GUIManager.cc
r7967 r7968 46 46 #include <elements/CEGUIListboxItem.h> 47 47 48 #ifdef CEGUI_OLD_VERSION48 #ifdef ORXONOX_OLD_CEGUI 49 49 # include <CEGUILua.h> 50 50 # include <ogreceguirenderer/OgreCEGUIRenderer.h> … … 127 127 , guiSystem_(NULL) 128 128 , resourceProvider_(NULL) 129 #if def CEGUI_OLD_VERSION129 #ifndef ORXONOX_OLD_CEGUI 130 130 , imageCodec_(NULL) 131 131 #endif … … 140 140 141 141 // Note: No SceneManager specified yet 142 #ifdef CEGUI_OLD_VERSION142 #ifdef ORXONOX_OLD_CEGUI 143 143 guiRenderer_ = new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000); 144 144 resourceProvider_ = guiRenderer_->createResourceProvider(); … … 155 155 // This is necessary to ensure that input events also use the right resource info when triggering lua functions 156 156 luaState_->setDefaultResourceInfo(this->rootFileInfo_); 157 #ifdef CEGUI_OLD_VERSION157 #ifdef ORXONOX_OLD_CEGUI 158 158 scriptModule_ = new LuaScriptModule(luaState_->getInternalLuaState()); 159 159 #else … … 171 171 172 172 // Create the CEGUI system singleton 173 #ifdef CEGUI_OLD_VERSION173 #ifdef ORXONOX_OLD_CEGUI 174 174 guiSystem_ = new System(guiRenderer_, resourceProvider_, 0, scriptModule_); 175 175 // Add functions that have been renamed in newer versions … … 207 207 using namespace CEGUI; 208 208 209 #ifdef CEGUI_OLD_VERSION209 #ifdef ORXONOX_OLD_CEGUI 210 210 delete guiSystem_; 211 211 delete guiRenderer_; … … 260 260 { 261 261 this->camera_ = camera; 262 #ifdef CEGUI_OLD_VERSION262 #ifdef ORXONOX_OLD_CEGUI 263 263 if (camera == NULL) 264 264 this->guiRenderer_->setTargetSceneManager(0); … … 551 551 void GUIManager::windowResized(unsigned int newWidth, unsigned int newHeight) 552 552 { 553 #ifdef CEGUI_OLD_VERSION553 #ifdef ORXONOX_OLD_CEGUI 554 554 this->guiRenderer_->setDisplaySize(CEGUI::Size(newWidth, newHeight)); 555 555 #else -
code/branches/kicklib/src/libraries/core/GUIManager.h
r7967 r7968 59 59 60 60 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7 61 # define CEGUI_OLD_VERSION61 # define ORXONOX_OLD_CEGUI 62 62 #endif 63 63 … … 153 153 Loki::ObjScopeGuardImpl0<GUIManager, void (GUIManager::*)()> destroyer_; 154 154 155 #ifdef CEGUI_OLD_VERSION155 #ifdef ORXONOX_OLD_CEGUI 156 156 CEGUI::OgreCEGUIRenderer* guiRenderer_; //!< CEGUI's interface to the Ogre Engine 157 157 CEGUI::ResourceProvider* resourceProvider_; //!< CEGUI's resource provider … … 161 161 CEGUI::OgreResourceProvider* resourceProvider_; //!< CEGUI's resource provider 162 162 CEGUI::OgreImageCodec* imageCodec_; 163 static const bool CEGUIVERSION7 = false;163 static const bool CEGUIVERSION7 = true; 164 164 #endif 165 165 LuaState* luaState_; //!< LuaState, access point to the Lua engine
Note: See TracChangeset
for help on using the changeset viewer.