Changeset 11131

Timestamp:

Mar 6, 2016, 4:43:02 PM (9 years ago)

Author:

landauf

Message:

initialize overlay component

Location:

code/branches/ogre1.9/src

Files:

• libraries/util/OgreForwardRefs.h (modified) (1 diff)
• orxonox/Scene.cc (modified) (3 diffs)
• orxonox/Scene.h (modified) (1 diff)

code/branches/ogre1.9/src/libraries/util/OgreForwardRefs.h

@@ -115 +115 @@
     class OverlayElementFactory;
     class OverlayManager;
+    class OverlaySystem;
     class Particle;
     class ParticleAffector;

code/branches/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->overlaySystem_ = new Ogre::OverlaySystem();
+            this->sceneManager_->addRenderQueueListener(this->overlaySystem_);
+#endif
 
             this->radar_ = new Radar();
@@ -134 +141 @@
             if (GameMode::showsGraphics())
             {
+#if OGRE_VERSION >= 0x010900
+                this->sceneManager_->removeRenderQueueListener(this->overlaySystem_);
+                delete this->overlaySystem_;
+#endif
                 this->sceneManager_->removeRenderQueueListener(this->renderQueueListener_);
                 delete this->renderQueueListener_;

code/branches/ogre1.9/src/orxonox/Scene.h

@@ -111 +111 @@
             Ogre::SceneNode*         rootSceneNode_; //!< This is a pointer to the root node of the Scene tree
             RenderQueueListener*     renderQueueListener_; //!< this is a pointer to the RenderQueueListener we're using for this Scene
+            Ogre::OverlaySystem*     overlaySystem_;
 
             std::string              skybox_; //!< This string holds information about the skybox we're using