- Timestamp:
- Feb 21, 2018, 12:03:52 AM (6 years ago)
- Location:
- code/branches/cegui0.8_ogre1.9
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cegui0.8_ogre1.9
- Property svn:mergeinfo changed
/code/branches/cegui0.8 (added) merged: 11110,11118,11121,11124 /code/branches/ogre1.9 (added) merged: 11125-11132,11211,11453-11454
- Property svn:mergeinfo changed
-
code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.h
r11085 r11795 52 52 53 53 #include "util/DestructionHelper.h" 54 #include "util/OgreForwardRefs.h" 54 55 #include "util/Singleton.h" 55 56 #include "config/Configurable.h" … … 79 80 void postUpdate(const Clock& time); 80 81 81 Ogre::Viewport* getViewport() { return this->viewport_; } 82 Ogre::RenderWindow* getRenderWindow() { return this->renderWindow_; } 82 Ogre::Viewport* getViewport() { return this->viewport_; } 83 Ogre::RenderWindow* getRenderWindow() { return this->renderWindow_; } 84 Ogre::OverlaySystem* getOverlaySystem() { return this->overlaySystem_; } 83 85 size_t getRenderWindowHandle(); 84 86 … … 129 131 Ogre::RenderWindow* renderWindow_; //!< the one and only render window 130 132 Ogre::Viewport* viewport_; //!< default full size viewport 133 Ogre::OverlaySystem* overlaySystem_; 131 134 GlowMaterialListener* glowMaterialListener_; //!< Material Listener for the 'Glow' compositor 132 135 float lastFrameStartTime_; //!< Time stamp of the beginning of the last frame
Note: See TracChangeset
for help on using the changeset viewer.