Changeset 8557 for code/branches/environment2

Timestamp:

May 24, 2011, 12:28:31 AM (14 years ago)

Author:

marwegma

Message:

Godrays: Safety commit. 90017 N8

Location:

code/branches/environment2

Files:

• WorldEntityShader.cpp (added)
• src/libraries/tools/Shader.h (modified) (1 diff)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/graphics/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/graphics/GlobalShader.h (modified) (1 diff)
• src/orxonox/graphics/GodrayShader.cc (moved) (moved from code/branches/environment2/src/orxonox/graphics/GlobalGodrayShader.cc) (2 diffs)
• src/orxonox/graphics/GodrayShader.h (moved) (moved from code/branches/environment2/src/orxonox/graphics/GlobalGodrayShader.h) (4 diffs)
• src/orxonox/graphics/WorldEntityShader.h (added)
• src/orxonox/worldentities/WorldEntity.cc (modified) (2 diffs)
• src/orxonox/worldentities/WorldEntity.h (modified) (2 diffs)

code/branches/environment2/src/libraries/tools/Shader.h

@@ -89 +89 @@
             inline Ogre::SceneManager* getSceneManager() const
                 { return this->scenemanager_; }
-
+            
+            /// Returns the compositor instance. Normally used for manually modifiying compositor parameters, when mt-type conversatio.
+            inline Ogre::CompositorInstance* getMutableCompositorInstance()
+                { return this->compositorInstance_; }
+        
             virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera);
 
+            void setParameter(size_t technique, size_t pass, const std::string& parameter, int value);
             void setParameter(size_t technique, size_t pass, const std::string& parameter, float value);
-            void setParameter(size_t technique, size_t pass, const std::string& parameter, int value);
 
             virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr);

code/branches/environment2/src/orxonox/OrxonoxPrereqs.h

@@ -111 +111 @@
     class FadingBillboard;
     class GlobalShader;
-    class GlobalGodrayShader;
+    class GodrayShader;
     class Light;
     class Model;

code/branches/environment2/src/orxonox/graphics/CMakeLists.txt

@@ -4 +4 @@
   FadingBillboard.cc
   GlobalShader.cc
-  GlobalGodrayShader.cc
+  GodrayShader.cc
   MeshLodInformation.cc
   Model.cc
@@ -10 +10 @@
   ParticleEmitter.cc
   ParticleSpawner.cc
+  WorldEntityShader.cc
 COMPILATION_BEGIN GraphicsCompilation.cc
   Backlight.cc

code/branches/environment2/src/orxonox/graphics/GlobalShader.h

@@ -50 +50 @@
             inline const Shader& getShader() const
                 { return this->shader_; }
+        
+            inline Shader& getMutableShader()
+                { return this->shader_; }
 
         private:

code/branches/environment2/src/orxonox/graphics/GodrayShader.cc

@@ -30 +30 @@
  @file
  
- @brief Implementation of the GlobalGodrayShader class.
+ @brief Implementation of the GodrayShader class.
  */
 
-#include "GlobalGodrayShader.h"
+
+#include "GodrayShader.h"
 
 #include "util/Exception.h"
@@ -41 +42 @@
 namespace orxonox
 {
-    CreateFactory(GlobalGodrayShader);
+    CreateFactory(GodrayShader);
     
-    GlobalGodrayShader::GlobalGodrayShader(BaseObject* creator) : BaseObject(creator), globalShader_(creator)
+    GodrayShader::GodrayShader(BaseObject* creator) : BaseObject(creator), globalShader_(creator)
     {
-        RegisterObject(GlobalGodrayShader);
+        RegisterObject(GodrayShader);
         
-        if (!this->getScene())
-            ThrowException(AbortLoading, "Can't create GlobalGodrayShader, no scene given.");
-        //        if (!this->getScene()->getSceneManager())
-        //            ThrowException(AbortLoading, "Can't create GlobalGodrayShader, no scene manager given.");
-        
+        // Default parameters are initialized
+        this->sunPosition_ = Vector3::Zero;
+        this->sunColor_ = ColourValue::White;
         this->skyColor_ = ColourValue::Black;
-        this->exposure_ = 1.0f;
+        this->exposure_ = 1.0f; 
         this->decay_ = 0.1f;
         this->density_ = 0.7f;
         
-        //// Init ////
+        // Godrays.compositor is getting initialized
+        this->globalShader_.getMutableShader().setCompositorName("Godrays");
+        this->compositor_ = this->globalShader_.getMutableShader().getMutableCompositorInstance();
     }
     
-    GlobalGodrayShader::~GlobalGodrayShader()
+    GodrayShader::~GodrayShader()
     {
         this->setVisible(false);
     }
     
-    void GlobalGodrayShader::tick(float dt)
+    void GodrayShader::tick(float dt)
     {
-        // To-Do
+        if(this->isVisible())
+        {
+            
+            //Reset sunPosition in the compositor instance every tick
+            this->compositor_->getTechnique()->getTargetPass(2)
+        }
     }
     
-    void GlobalGodrayShader::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    void GodrayShader::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(GlobalGodrayShader, XMLPort, xmlelement, mode);
+        SUPER(GodrayShader, XMLPort, xmlelement, mode);
         
-        XMLPortParamTemplate(GlobalGodrayShader, "sunPosition", setSunPosition, getSunPosition, xmlelement, mode, const Vector3&);
-        XMLPortParamTemplate(GlobalGodrayShader, "skyColor", setSkyColor, getSkyColor, xmlelement, mode, const ColourValue&);
-        XMLPortParamVariable(GlobalGodrayShader, "exposure", exposure_, xmlelement, mode);
-        XMLPortParamVariable(GlobalGodrayShader, "decay", decay_, xmlelement, mode);
-        XMLPortParamVariable(GlobalGodrayShader, "density", density_, xmlelement, mode);
+        XMLPortParamTemplate(GodrayShader, "sunColor", setSunColor, getSunColor, xmlelement, mode, const ColourValue&);
+        XMLPortParamTemplate(GodrayShader, "skyColor", setSkyColor, getSkyColor, xmlelement, mode, const ColourValue&);
+        XMLPortParamVariable(GodrayShader, "exposure", exposure_, xmlelement, mode);
+        XMLPortParamVariable(GodrayShader, "decay", decay_, xmlelement, mode);
+        XMLPortParamVariable(GodrayShader, "density", density_, xmlelement, mode);
     }
     
-    void GlobalGodrayShader::setSunPosition(const Vector3& position)
+    void GodrayShader::setWorldEntity(WorldEntity* worldEntity)
+    {
+        this->worldEntity_ = worldEntity;
+        this->setSunPosition(worldEntity->getWorldPosition());
+    }
+    
+    void GodrayShader::setSunPosition(const Vector3& position)
     {
         this->sunPosition_ = position;
     }
-    void GlobalGodrayShader::setSkyColor(const ColourValue& color)
+    void GodrayShader::setSunColor(const ColourValue& color)
     {
         this->skyColor_ = color;
     }
-    const Vector3& GlobalGodrayShader::getSunPosition() const
+    void GodrayShader::setSkyColor(const ColourValue& color)
+    {
+        this->skyColor_ = color;
+    }
+    const Vector3& GodrayShader::getSunPosition() const
     {
         return this->sunPosition_;
     }
-    const ColourValue& GlobalGodrayShader::getSkyColor() const
+    const ColourValue& GodrayShader::getSunColor() const
+    {
+        return this->sunColor_;
+    }
+    const ColourValue& GodrayShader::getSkyColor() const
     {
         return this->skyColor_;
     }
     
-    void GlobalGodrayShader::changedVisibility()
+    void GodrayShader::changedVisibility()
     {
-        SUPER(GlobalGodrayShader, changedVisibility);
+        SUPER(GodrayShader, changedVisibility);
         
         this->globalShader_.setVisible(this->isVisible());

code/branches/environment2/src/orxonox/graphics/GodrayShader.h

@@ -31 +31 @@
  @file
  
- @brief Header of the GlobalGodrayShader class.
+ @brief Header of the GodrayShader class.
 */
 
 
-#ifndef _GlobalGodrayShader_H__
-#define _GlobalGodrayShader_H__
+#ifndef _GodrayShader_H__
+#define _GodrayShader_H__
 
 #include "OrxonoxPrereqs.h"
+
+#include <OgreCompositorInstance.h>
 
 #include "tools/interfaces/Tickable.h"
 #include "core/BaseObject.h"
 #include "util/Math.h"
+#include "WorldEntity.h"
 #include "GlobalShader.h"
 
@@ -52 +55 @@
      
     */
-    class _OrxonoxExport GlobalGodrayShader : public BaseObject, public Tickable
+    class _OrxonoxExport GodrayShader : public BaseObject, public Tickable
     {
         public:
-            GlobalGodrayShader(BaseObject* creator);
-            virtual ~GlobalGodrayShader();
+            GodrayShader(BaseObject* creator);
+            virtual ~GodrayShader();
             
             virtual void tick(float dt);
+        
+            virtual void updateParameters();
             
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
         
             virtual void changedVisibility();
+        
+            void setWorldEntity(WorldEntity* worldEntity);
             
             inline const GlobalShader& getGlobalShader() const
@@ -68 +75 @@
         
             void setSunPosition(const Vector3& position);
+            void setSunColor(const ColourValue& color);
             void setSkyColor(const ColourValue& color);
             const Vector3& getSunPosition() const;
+            const ColourValue& getSunColor() const;
             const ColourValue& getSkyColor() const;
         
         private:
-            
+        
+            WorldEntity* worldEntity_;
             GlobalShader globalShader_;
-            
+            Ogre::CompositorInstance* compositor_;
             Vector3 sunPosition_;
+            ColourValue sunColor_;
             ColourValue skyColor_;
             float exposure_;
@@ -84 +95 @@
 }
 
-#endif /* _GlobalGodrayShader_H__ */
+#endif /* _GodrayShader_H__ */

code/branches/environment2/src/orxonox/worldentities/WorldEntity.cc

@@ -177 +177 @@
         // Attached collision shapes
         XMLPortObject(WorldEntity, CollisionShape, "collisionShapes", attachCollisionShape, getAttachedCollisionShape, xmlelement, mode);
+        // Attach WorldEntityShaders that depend on WorldEntity data (e.g. position). -- TODO -- Extend to WorldEntityShader.
+        XMLPortObject(WorldEntity, GodrayShader, "shaders", attachShader, getAttachedObject, xmlelement, mode);
     }
 
@@ -510 +512 @@
         return 0;
     }
+    
+    void WorldEntity::attachShader(GodrayShader* object)
+    {
+        object->setWorldEntity(object);
+        
+        this->shaders_.insert(object);
+    }
+    void WorldEntity::detachShader(GodrayShader* object)
+    {
+        std::set<WorldEntity*>::iterator it = this->children_.find(object);
+        this->shaders_.erase(it);
+        
+    }
+    GodrayShader* WorldEntity::getAttachedShader(unsigned int index)
+    {
+        unsigned int i = 0;
+        for (std::set<WorldEntity*>::const_iterator it = this->children_.begin(); it != this->children_.end(); ++it)
+        {
+            if (i == index)
+                return (*it);
+            ++i;
+        }
+        return 0;
+    }
 
     //! Attaches an Ogre::SceneNode to this WorldEntity.

code/branches/environment2/src/orxonox/worldentities/WorldEntity.h

@@ -199 +199 @@
             void attachToNode(Ogre::SceneNode* node);
             void detachFromNode(Ogre::SceneNode* node);
+            
+            void attachShader(GodrayShader* object);
+            void detachShader(GodrayShader* object);
+            GodrayShader* getAttachedShader(unsigned int index);
+            inline const std::set<WorldEntity*>& getAttachedShaders() const
+            { return this->shaders_; }
 
             inline void setDeleteWithParent(bool value)
@@ -234 +240 @@
             unsigned int parentID_;
             std::set<WorldEntity*> children_;
+            std::set<WorldEntity*> shaders_;
             bool bDeleteWithParent_;