Changeset 11795 for code/branches/cegui0.8_ogre1.9/src/orxonox/Scene.cc

Timestamp:

Feb 21, 2018, 12:03:52 AM (6 years ago)

Author:

landauf

Message:

merged ogre1.9 (including cegui0.8) into new branch

Location:

code/branches/cegui0.8_ogre1.9

Files:

• . (modified) (1 prop)
• src/orxonox/Scene.cc (modified) (3 diffs)

code/branches/cegui0.8_ogre1.9/src/orxonox/Scene.cc

@@ -40 +40 @@
 #include <OgreSceneManagerEnumerator.h>
 #include <OgreSceneNode.h>
+#if OGRE_VERSION >= 0x010900
+#   include <Overlay/OgreOverlaySystem.h>
+#endif
 
 #include <BulletCollision/BroadphaseCollision/btAxisSweep3.h>
@@ -90 +93 @@
             this->renderQueueListener_ = new RenderQueueListener();
             this->sceneManager_->addRenderQueueListener(this->renderQueueListener_);//add our own renderQueueListener
+#if OGRE_VERSION >= 0x010900
+            this->sceneManager_->addRenderQueueListener(GraphicsManager::getInstance().getOverlaySystem());
+#endif
 
             this->radar_ = new Radar();
@@ -134 +140 @@
             if (GameMode::showsGraphics())
             {
+#if OGRE_VERSION >= 0x010900
+                this->sceneManager_->removeRenderQueueListener(GraphicsManager::getInstance().getOverlaySystem());
+#endif
                 this->sceneManager_->removeRenderQueueListener(this->renderQueueListener_);
                 delete this->renderQueueListener_;