Changeset 8583 for code/branches/presentation/src/orxonox/worldentities

Timestamp:

May 25, 2011, 10:52:36 PM (14 years ago)

Author:

dafrick

Message:

Fixing possible bug.

File:

• code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -262 +262 @@
     {
         //make sure the ship is only shaking if it's moving
-        if (this->getVelocity().squaredLength() > 80)
+        if (this->getVelocity().squaredLength() > 80.0f)
         {
             this->shakeDt_ += dt;
     
-            int frequency = this->shakeFrequency_ * (this->getVelocity().squaredLength());
-    
-            if (this->shakeDt_ >= 1 /(frequency))
-            {
-                this->shakeDt_ -= 1/(frequency);
-            }
-    
-            Degree angle = Degree(sin(this->shakeDt_ * 2* math::pi * frequency) * this->shakeAmplitude_);
+            float frequency = this->shakeFrequency_ * (this->getVelocity().squaredLength());
+    
+            if (this->shakeDt_ >= 1.0f/frequency)
+            {
+                this->shakeDt_ -= 1.0f/frequency;
+            }
+    
+            Degree angle = Degree(sin(this->shakeDt_ *2.0f* math::pi * frequency) * this->shakeAmplitude_);
     
             //COUT(0) << "Angle: " << angle << std::endl;