Changeset 8858 for code/trunk/src/libraries/core/GUIManager.h
- Timestamp:
- Aug 23, 2011, 12:45:53 AM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 1 build 2 2 codeblocks 3 vs 3 4 dependencies
-
- Property svn:mergeinfo changed
/code/branches/output (added) merged: 8739-8740,8765,8771-8772,8774-8780,8787-8789,8794-8799,8801,8803-8812,8814,8816-8817,8820,8822,8825-8837,8840,8844,8846,8848-8850,8853-8854
- Property svn:ignore
-
code/trunk/src/libraries/core/GUIManager.h
r8729 r8858 152 152 bool protectedCall(FunctionType function); 153 153 154 void changedCeguiOutputLevel(); 155 154 156 // keyHandler functions 155 157 void buttonPressed (const KeyEvent& evt); … … 168 170 169 171 #ifdef ORXONOX_OLD_CEGUI 170 CEGUI::OgreCEGUIRenderer* guiRenderer_; //!< CEGUI's interface to the Ogre Engine171 CEGUI::ResourceProvider* resourceProvider_; //!< CEGUI's resource provider172 CEGUI::OgreCEGUIRenderer* guiRenderer_; //!< CEGUI's interface to the Ogre Engine 173 CEGUI::ResourceProvider* resourceProvider_; //!< CEGUI's resource provider 172 174 #else 173 CEGUI::OgreRenderer* guiRenderer_; //!< CEGUI's interface to the Ogre Engine174 CEGUI::OgreResourceProvider* resourceProvider_; //!< CEGUI's resource provider175 Ogre::RenderQueueListener* rqListener_; //!< RQ listener so we can draw UNDER Ogre overlays175 CEGUI::OgreRenderer* guiRenderer_; //!< CEGUI's interface to the Ogre Engine 176 CEGUI::OgreResourceProvider* resourceProvider_; //!< CEGUI's resource provider 177 Ogre::RenderQueueListener* rqListener_; //!< RQ listener so we can draw UNDER Ogre overlays 176 178 CEGUI::OgreImageCodec* imageCodec_; 177 179 #endif 178 LuaState* luaState_; //!< LuaState, access point to the Lua engine 179 CEGUI::LuaScriptModule* scriptModule_; //!< CEGUI's script module to use Lua 180 CEGUI::System* guiSystem_; //!< CEGUI's main system 181 shared_ptr<ResourceInfo> rootFileInfo_; //!< Resource information about the root script 182 CEGUI::Logger* ceguiLogger_; //!< CEGUI's logger to be able to log CEGUI errors in our log 183 CEGUI::Window* rootWindow_; //!< Root node for all windows 184 CEGUI::Window* hudRootWindow_; //!< Root node for the HUD sheets 185 CEGUI::Window* menuRootWindow_; //!< Root node for the menu sheets (used by Lua) 186 std::map<std::string, PlayerInfo*> players_; //!< Stores the player (owner) for each GUI 187 Ogre::Camera* camera_; //!< Camera used to render the scene with the GUI 180 LuaState* luaState_; //!< LuaState, access point to the Lua engine 181 CEGUI::LuaScriptModule* scriptModule_; //!< CEGUI's script module to use Lua 182 CEGUI::System* guiSystem_; //!< CEGUI's main system 183 shared_ptr<ResourceInfo> rootFileInfo_; //!< Resource information about the root script 184 CEGUI::Logger* ceguiLogger_; //!< CEGUI's logger to be able to log CEGUI errors in our log 185 int outputLevelCeguiLog_; //!< CEGUI's log level 186 CEGUI::Window* rootWindow_; //!< Root node for all windows 187 CEGUI::Window* hudRootWindow_; //!< Root node for the HUD sheets 188 CEGUI::Window* menuRootWindow_; //!< Root node for the menu sheets (used by Lua) 189 std::map<std::string, PlayerInfo*> players_; //!< Stores the player (owner) for each GUI 190 Ogre::Camera* camera_; //!< Camera used to render the scene with the GUI 188 191 189 192 /// Helper object that executes the surrogate destructor destroy() 190 193 DestructionHelper<GUIManager> destructionHelper_; 191 194 192 static GUIManager* singletonPtr_s; //!< Singleton reference to GUIManager195 static GUIManager* singletonPtr_s; //!< Singleton reference to GUIManager 193 196 194 197 // The used CEGUI scheme. … … 196 199 std::string guiScheme_; 197 200 bool oldCEGUI_; 198 201 199 202 int numScrollLines_; ///< How many lines to scroll in a list if the scroll wheel is used 200 203
Note: See TracChangeset
for help on using the changeset viewer.