Changeset 1228

Timestamp:

May 3, 2008, 9:09:20 PM (17 years ago)

Author:

rgrieder

Message:

merged bugfix to input branch

File:

• code/branches/input/src/orxonox/objects/WorldEntity.h (modified) (1 diff)

code/branches/input/src/orxonox/objects/WorldEntity.h

@@ -155 +155 @@
 
             inline void setRotationAxisLoader(const Vector3& axis)
-                { this->rotationAxis_ = axis; }
+                { this->rotationAxis_ = axis; rotationAxis_.normalise(); }
             inline void setRotationAxis(const Vector3& axis)
-                { this->rotationAxis_ = axis; }
+                { this->rotationAxis_ = axis; rotationAxis_.normalise(); }
             inline void setRotationAxis(Real x, Real y, Real z)
-                { this->rotationAxis_.x = x; this->rotationAxis_.y = y; this->rotationAxis_.z = z; }
+                { this->rotationAxis_.x = x; this->rotationAxis_.y = y; this->rotationAxis_.z = z; rotationAxis_.normalise(); }
             inline const Vector3& getRotationAxis() const
                 { return this->rotationAxis_; }