Changeset 11085 for code/trunk/src/orxonox

Timestamp:

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

Author:

landauf

Message:

enable glow shader in all scenes

Location:

code/trunk/src/orxonox

Files:

• Scene.cc (modified) (4 diffs)
• Scene.h (modified) (1 diff)
• graphics/GlobalShader.h (modified) (1 diff)

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_; }