Changeset 8332 for code/branches/kicklib2/src/orxonox/graphics

Timestamp:

Apr 26, 2011, 2:52:04 AM (14 years ago)

Author:

rgrieder

Message:

BlinkingBillboard should not use long double for storing the time because of a precision loss on certain configurations.
Instead, wrap around before computing the sine.

Location:

code/branches/kicklib2/src/orxonox/graphics

Files:

• BlinkingBillboard.cc (modified) (1 diff)
• BlinkingBillboard.h (modified) (1 diff)

code/branches/kicklib2/src/orxonox/graphics/BlinkingBillboard.cc

@@ -79 +79 @@
         if (this->isActive())
         {
-            this->time_ += dt;
+            // Wrap around to avoid loosing floating point precision
+            this->time_ = std::fmod(this->time_ + dt, 1.0f / this->frequency_);
+            float value = sin((2.0f * math::pi * this->time_ + this->phase_.valueRadians()) * this->frequency_);
             if (this->bQuadratic_)
-                this->setScale(this->amplitude_ * static_cast<float>(square(sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_))));
+                this->setScale(this->amplitude_ * square(value));
             else
-                this->setScale(this->amplitude_ * static_cast<float>(fabs(sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_))));
+                this->setScale(this->amplitude_ * std::abs(value));
         }
     }

code/branches/kicklib2/src/orxonox/graphics/BlinkingBillboard.h

@@ -75 +75 @@
             Degree phase_;
             bool bQuadratic_;
-            long double time_;
+            float time_;
     };
 }