Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 24, 2011, 12:28:31 AM (14 years ago)
Author:
marwegma
Message:

Godrays: Safety commit. 90017 N8

File:
1 moved

Legend:

Unmodified
Added
Removed
  • code/branches/environment2/src/orxonox/graphics/GodrayShader.h

    r8497 r8557  
    3131 @file
    3232 
    33  @brief Header of the GlobalGodrayShader class.
     33 @brief Header of the GodrayShader class.
    3434*/
    3535
    3636
    37 #ifndef _GlobalGodrayShader_H__
    38 #define _GlobalGodrayShader_H__
     37#ifndef _GodrayShader_H__
     38#define _GodrayShader_H__
    3939
    4040#include "OrxonoxPrereqs.h"
     41
     42#include <OgreCompositorInstance.h>
    4143
    4244#include "tools/interfaces/Tickable.h"
    4345#include "core/BaseObject.h"
    4446#include "util/Math.h"
     47#include "WorldEntity.h"
    4548#include "GlobalShader.h"
    4649
     
    5255     
    5356    */
    54     class _OrxonoxExport GlobalGodrayShader : public BaseObject, public Tickable
     57    class _OrxonoxExport GodrayShader : public BaseObject, public Tickable
    5558    {
    5659        public:
    57             GlobalGodrayShader(BaseObject* creator);
    58             virtual ~GlobalGodrayShader();
     60            GodrayShader(BaseObject* creator);
     61            virtual ~GodrayShader();
    5962           
    6063            virtual void tick(float dt);
     64       
     65            virtual void updateParameters();
    6166           
    6267            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    6368       
    6469            virtual void changedVisibility();
     70       
     71            void setWorldEntity(WorldEntity* worldEntity);
    6572           
    6673            inline const GlobalShader& getGlobalShader() const
     
    6875       
    6976            void setSunPosition(const Vector3& position);
     77            void setSunColor(const ColourValue& color);
    7078            void setSkyColor(const ColourValue& color);
    7179            const Vector3& getSunPosition() const;
     80            const ColourValue& getSunColor() const;
    7281            const ColourValue& getSkyColor() const;
    7382       
    7483        private:
    75            
     84       
     85            WorldEntity* worldEntity_;
    7686            GlobalShader globalShader_;
    77            
     87            Ogre::CompositorInstance* compositor_;
    7888            Vector3 sunPosition_;
     89            ColourValue sunColor_;
    7990            ColourValue skyColor_;
    8091            float exposure_;
     
    8495}
    8596
    86 #endif /* _GlobalGodrayShader_H__ */
     97#endif /* _GodrayShader_H__ */
Note: See TracChangeset for help on using the changeset viewer.