Changeset 11132 for code/branches/ogre1.9/src/orxonox

Timestamp:

Mar 6, 2016, 9:18:13 PM (8 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

Location:

code/branches/ogre1.9/src/orxonox

Files:

• Scene.cc (modified) (2 diffs)
• Scene.h (modified) (1 diff)

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

@@ -94 +94 @@
             this->sceneManager_->addRenderQueueListener(this->renderQueueListener_);//add our own renderQueueListener
 #if OGRE_VERSION >= 0x010900
-            this->overlaySystem_ = new Ogre::OverlaySystem();
-            this->sceneManager_->addRenderQueueListener(this->overlaySystem_);
+            this->sceneManager_->addRenderQueueListener(GraphicsManager::getInstance().getOverlaySystem());
 #endif
 
@@ -142 +141 @@
             {
 #if OGRE_VERSION >= 0x010900
-                this->sceneManager_->removeRenderQueueListener(this->overlaySystem_);
-                delete this->overlaySystem_;
+                this->sceneManager_->removeRenderQueueListener(GraphicsManager::getInstance().getOverlaySystem());
 #endif
                 this->sceneManager_->removeRenderQueueListener(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