Changeset 11079 for code/branches/shaders_merge/src

Timestamp:

Jan 19, 2016, 11:05:02 PM (9 years ago)

Author:

landauf

Message:

bugfix: the attached objects are stored in a set, so there's no guarantee about the order of the elements. store the billboards of the lens flare in an ordered vector to ensure that the billboards are updated with the correct parameters.

Location:

code/branches/shaders_merge/src/orxonox/graphics

Files:

• LensFlare.cc (modified) (3 diffs)
• LensFlare.h (modified) (1 diff)

code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc

@@ -106 +106 @@
             lensPart->setVisible(true);
             this->attach(lensPart);
+            this->billboards_.push_back(lensPart);
         }
     }
@@ -125 +126 @@
 
         int i = 0;
-        for (WorldEntity* attachedObject : this->getAttachedObjects())
-        {
-            Billboard* billboard = orxonox_cast<Billboard*>(attachedObject);
-            if (billboard == this->occlusionBillboard_)
-                continue;
+        for (Billboard* billboard : this->billboards_)
+        {
             const LensFlare::Lens& lens = lensConfiguration_.at(i);
             billboard->setPosition(-viewDirection * (1.0f - lens.position_));
@@ -149 +147 @@
 
         int i = 0;
-        for (WorldEntity* attachedObject : this->getAttachedObjects())
-        {
-            Billboard* billboard = orxonox_cast<Billboard*>(attachedObject);
-            if (billboard == this->occlusionBillboard_)
-                continue;
+        for (Billboard* billboard : this->billboards_)
+        {
             cur.a = alpha * lensConfiguration_.at(i).alpha_;
             billboard->setColour(cur);

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

@@ -178 +178 @@
             std::vector<Lens> lensConfiguration_;//!< this stores the lensConfiguration
             Billboard* occlusionBillboard_;//!< this is a transparent billboard used solely for the Hardware Occlusion Query
+            std::vector<Billboard*> billboards_; //!< The visible billboards
+
             float scale_;//!< this factor is used to scale the billboard to the desired size
             bool fadeOnViewBorder_;//!< should the effect fade out on the border of the view?