Changeset 11085 for code/trunk/src

Timestamp:

Jan 23, 2016, 9:34:29 PM (9 years ago)

Author:

landauf

Message:

enable glow shader in all scenes

Location:

code/trunk/src

Files:

• libraries/core/CorePrereqs.h (modified) (1 diff)
• libraries/core/GlowMaterialListener.h (added)
• libraries/core/GraphicsManager.cc (modified) (6 diffs)
• libraries/core/GraphicsManager.h (modified) (1 diff)
• orxonox/Scene.cc (modified) (4 diffs)
• orxonox/Scene.h (modified) (1 diff)
• orxonox/graphics/GlobalShader.h (modified) (1 diff)

code/trunk/src/libraries/core/CorePrereqs.h

@@ -184 +184 @@
     struct GameStateInfo;
     struct GameStateTreeNode;
+    class GlowMaterialListener;
     class GraphicsManager;
     class GUIManager;

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -38 +38 @@
 #include <OgreRoot.h>
 #include <OgreLogManager.h>
+#include <OgreMaterialManager.h>
 #include <OgreRenderWindow.h>
 #include <OgreRenderSystem.h>
@@ -56 +57 @@
 #include "Game.h"
 #include "GameMode.h"
+#include "GlowMaterialListener.h"
 #include "GUIManager.h"
 #include "Loader.h"
@@ -100 +102 @@
         , renderWindow_(nullptr)
         , viewport_(nullptr)
+        , glowMaterialListener_(nullptr)
         , lastFrameStartTime_(0.0f)
         , lastFrameEndTime_(0.0f)
@@ -140 +143 @@
         orxout(internal_status) << "destroying GraphicsManager..." << endl;
 
+        Ogre::MaterialManager::getSingleton().removeListener(this->glowMaterialListener_);
         Ogre::WindowEventUtilities::removeWindowEventListener(renderWindow_, ogreWindowEventListener_);
+
         ModifyConsoleCommand(__CC_printScreen_name).resetFunction();
         ModifyConsoleCommand(__CC_GraphicsManager_group, __CC_setScreenResolution_name).resetFunction();
@@ -153 +158 @@
         safeObjectDelete(&ogreLogger_);
         safeObjectDelete(&ogreWindowEventListener_);
+        safeObjectDelete(&glowMaterialListener_);
 
         orxout(internal_status) << "finished destroying GraphicsManager" << endl;
@@ -306 +312 @@
 
         Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(Ogre::MIP_UNLIMITED);
+
+        this->glowMaterialListener_ = new GlowMaterialListener();
+        Ogre::MaterialManager::getSingleton().addListener(this->glowMaterialListener_);
 
         //Add program icon

code/trunk/src/libraries/core/GraphicsManager.h

@@ -127 +127 @@
         Ogre::LogManager*        ogreLogger_;
         Ogre::Root*              ogreRoot_;                //!< Ogre's root
-        Ogre::RenderWindow* renderWindow_;             //!< the one and only render window
-        Ogre::Viewport*     viewport_;                 //!< default full size viewport
-        float               lastFrameStartTime_;       //!< Time stamp of the beginning of the last frame
-        float               lastFrameEndTime_;         //!< Time stamp of the end of the last frame
+        Ogre::RenderWindow*      renderWindow_;            //!< the one and only render window
+        Ogre::Viewport*          viewport_;                //!< default full size viewport
+        GlowMaterialListener*    glowMaterialListener_;    //!< Material Listener for the 'Glow' compositor
+        float                    lastFrameStartTime_;      //!< Time stamp of the beginning of the last frame
+        float                    lastFrameEndTime_;        //!< Time stamp of the end of the last frame
 
         // XML files for the resources and the debug overlay

code/trunk/src/orxonox/Scene.cc

@@ -58 +58 @@
 #include "Level.h"
 #include "RenderQueueListener.h"
+#include "graphics/GlobalShader.h"
 
 namespace orxonox
@@ -91 +92 @@
 
             this->radar_ = new Radar();
+            this->glowShader_ = new GlobalShader(this);
+            this->glowShader_->setScene(WeakPtr<Scene>(this), this->getObjectID()); // avoid circular reference
+            this->glowShader_->getShader().setCompositorName("Glow");
         }
         else
@@ -100 +104 @@
             this->renderQueueListener_ = nullptr;
             this->radar_ = nullptr;
+            this->glowShader_ = nullptr;
         }
 
@@ -124 +129 @@
             if (this->radar_)
                 this->radar_->destroy();
+            if (this->glowShader_)
+                this->glowShader_->destroy();
 
             if (GameMode::showsGraphics())

code/trunk/src/orxonox/Scene.h

@@ -118 +118 @@
             float                    soundReferenceDistance_; //!< This holds a reference distance, which represents the distance between our scene and the listener
             Radar*                   radar_; //!< This is a pointer to a Radar object assigned with this scene
+            WeakPtr<GlobalShader>    glowShader_;
 
 

code/trunk/src/orxonox/graphics/GlobalShader.h

@@ -48 +48 @@
             virtual void changedVisibility() override;
 
-            inline const Shader& getShader() const
+            inline Shader& getShader()
                 { return this->shader_; }