Changeset 11132 for code/branches/ogre1.9/src/libraries/core/GraphicsManager.cc

Timestamp:

Mar 6, 2016, 9:18:13 PM (9 years ago)

Author:

landauf

Message:

fixed overlays with ogre 1.9.
OverlaySystem must be initialized once after ogre-root and connected as listener to every scene manager

File:

• code/branches/ogre1.9/src/libraries/core/GraphicsManager.cc (modified) (3 diffs)

code/branches/ogre1.9/src/libraries/core/GraphicsManager.cc

@@ -45 +45 @@
 #include <OgreViewport.h>
 #include <OgreWindowEventUtilities.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlaySystem.h>
+#endif
 
 #include "SpecialConfig.h"
@@ -115 +118 @@
         this->loadOgreRoot();
 
+#if OGRE_VERSION >= 0x010900
+        this->overlaySystem_ = new Ogre::OverlaySystem();
+#else
+        this->overlaySystem_ = nullptr;
+#endif
+
         // At first, add the root paths of the data directories as resource locations
         Ogre::ResourceGroupManager::getSingleton().addResourceLocation(ConfigurablePaths::getDataPathString(), "FileSystem");
@@ -155 +164 @@
         Loader::getInstance().unload(extResources_.get());
 
+#if OGRE_VERSION >= 0x010900
+        safeObjectDelete(&overlaySystem_);
+#endif
         safeObjectDelete(&ogreRoot_);
         safeObjectDelete(&ogreLogger_);