Changeset 2025 for code/branches/objecthierarchy/src/orxonox/objects

Timestamp:

Oct 28, 2008, 9:36:20 AM (16 years ago)

Author:

rgrieder

Message:

Removed something we better never mention again…

File:

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

code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -107 +107 @@
             velocity.z = -this->maxSpeed_;
 
-#define normalize_acc_and_vel(dimension)                                 \
-        if (this->acceleration_.dimension == 0)                          \
-        {                                                                \
-            if (velocity.dimension > 0)                                  \
-            {                                                            \
-                velocity.dimension -= (this->translationDamping_ * dt);  \
-                if (velocity.dimension < 0)                              \
-                    velocity.dimension = 0;                              \
-            }                                                            \
-            else if (velocity.dimension < 0)                             \
-            {                                                            \
-                velocity.dimension += (this->translationDamping_ * dt);  \
-                if (velocity.dimension > 0)                              \
-                    velocity.dimension = 0;                              \
-            }                                                            \
+        // normalize velocity and acceleration
+        for (size_t dimension = 0; dimension < 3; ++dimension)
+        {
+            if (this->acceleration_[dimension] == 0)
+            {
+                if (velocity[dimension] > 0)
+                {
+                    velocity[dimension] -= (this->translationDamping_ * dt);
+                    if (velocity[dimension] < 0)
+                        velocity[dimension] = 0;
+                }
+                else if (velocity[dimension] < 0)
+                {
+                    velocity[dimension] += (this->translationDamping_ * dt);
+                    if (velocity[dimension] > 0)
+                        velocity[dimension] = 0;
+                }
+            }
         }
-
-        normalize_acc_and_vel(x)
-        normalize_acc_and_vel(y)
-        normalize_acc_and_vel(z)
 
         this->setVelocity(velocity);