Changeset 6136

Timestamp:

Nov 24, 2009, 2:35:24 AM (14 years ago)

Author:

landauf

Message:

BlinkingBillboard now blinks properly also with ogre 1.6 (which doesn't like negative scales anymore)

File:

• code/branches/presentation2/src/orxonox/graphics/BlinkingBillboard.cc (modified) (1 diff)

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

@@ -81 +81 @@
                 this->setScale(this->amplitude_ * static_cast<float>(square(sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_))));
             else
-                this->setScale(this->amplitude_ * static_cast<float>(sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_)));
+                this->setScale(this->amplitude_ * static_cast<float>(fabs(sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_))));
         }
     }