Changeset 9500 for code/branches/shaders/src/orxonox/graphics/LensFlare.h

Timestamp:

Dec 10, 2012, 3:26:49 PM (12 years ago)

Author:

davidsa

Message:

Added nested Class Lens to LensFlare, to simplify lens flare configuration and some of the methods. Might also be used to define presets in the future.

File:

• code/branches/shaders/src/orxonox/graphics/LensFlare.h (modified) (5 diffs)

code/branches/shaders/src/orxonox/graphics/LensFlare.h

@@ -46 +46 @@
 
 namespace orxonox
-{
+{    
       /**
     @brief
@@ -61 +61 @@
     class _OrxonoxExport LensFlare : public StaticEntity, public Tickable
     {
+          /**
+          @brief
+              This is a nested Class used to easily set properties of the different sublenses of a LensFlare effect
+          */
+          class Lens
+          {
+              public:
+                  std::string* material_;//!< Which material should the Lens use, current choices include burst, bursthalo, halo1, halo2, halo3
+                  float alpha_;//!< Which base alpha value should the Lens use
+                  float scale_;//!< Which base scale should the Lens Flare have
+                  float position_;//!< This defines how far along the view direction the flare should be positioned, e.g. 0.5 would position the flare halfway between the viewer and the base burst, 0 at the camera, 1 at the burst
+                  Lens(std::string* material, float alpha, float scale, float position)
+                  {
+                      this->material_=material;
+                      this->alpha_=alpha;
+                      this->scale_=scale;
+                      this->position_=position;
+                  }
+          };
+          
         public:
             LensFlare(BaseObject* creator);
@@ -69 +89 @@
             inline float getScale() const
                 { return this->scale_; }
+                
+            /**
+            @brief
+                This sets the base colour of the billboards
+            @param colour
+                Vector3 containing r,g,b values
+            */
+            inline void setColour(const ColourValue& colour)
+            {
+                this->colour_->r=colour.r;
+                this->colour_->g=colour.g;
+                this->colour_->b=colour.b;
+            }
+            /**
+            @brief
+                This returns the current base colour of the billboards
+            @return a Vector3 containing r,g,b values
+            */
+            inline const ColourValue& getColour() const
+                { return *(new ColourValue(this->colour_->r,this->colour_->g,this->colour_->b)); }
                 
             /**
@@ -141 +181 @@
             unsigned int getPointCount(float dimension) const;
             
+            std::vector<Lens*>* lensConfiguration_;//!< this stores the lensConfiguration
             Billboard* occlusionBillboard_;//!< this is a transparent billboard used solely for the Hardware Occlusion Query
             float cameraDistance_;//!< current distance of the lensflare center from the camera
@@ -147 +188 @@
             unsigned int fadeResolution_;//!< how many points should be sampled per axis for the screen border fade. High number => smooth fade, but uses more processing power
             float fadeExponent_;//!< this determines how fast the flare fades away as it gets obstructed
-            //TODO: add XML port for colour manipulation
             ColourValue* colour_;//!< this stores the base colour of the light
     };