Changeset 1989 for code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.h

Timestamp:

Oct 21, 2008, 4:56:41 PM (16 years ago)

Author:

landauf

Message:

• added ControllableEntity, the baseclass of all players, vehicles and ships.
• moved Template to core
• some changes in Camera
• added 6 constants to WorldEntity to identify relative directions
• changed vom Radian to Degree as default angle unit

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.h (modified) (4 diffs)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.h

@@ -54 +54 @@
                 { return this->node_; }
 
+            static const Vector3 FRONT;
+            static const Vector3 BACK;
+            static const Vector3 LEFT;
+            static const Vector3 RIGHT;
+            static const Vector3 DOWN;
+            static const Vector3 UP;
+
             virtual void setPosition(const Vector3& position) = 0;
             inline void setPosition(float x, float y, float z)
@@ -71 +78 @@
             inline void setOrientation(const Vector3& axis, const Radian& angle)
                 { this->setOrientation(Quaternion(angle, axis)); }
+            inline void setOrientation(const Vector3& axis, const Degree& angle)
+                { this->setOrientation(Quaternion(angle, axis)); }
             inline const Quaternion& getOrientation() const
                 { return this->node_->getOrientation(); }
@@ -77 +86 @@
 
             virtual void rotate(const Quaternion& rotation, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL) = 0;
+            inline void rotate(const Vector3& axis, const Degree& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL)
+                { this->rotate(Quaternion(angle, axis), relativeTo); }
             inline void rotate(const Vector3& axis, const Radian& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL)
                 { this->rotate(Quaternion(angle, axis), relativeTo); }
 
-            virtual void yaw(const Radian& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL) = 0;
-            virtual void pitch(const Radian& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL) = 0;
-            virtual void roll(const Radian& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL) = 0;
+            virtual void yaw(const Degree& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL) = 0;
+            inline void yaw(const Radian& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL)
+                { this->yaw(Degree(angle), relativeTo); }
+            virtual void pitch(const Degree& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL) = 0;
+            inline void pitch(const Radian& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL)
+                { this->pitch(Degree(angle), relativeTo); }
+            virtual void roll(const Degree& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL) = 0;
+            inline void roll(const Radian& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL)
+                { this->roll(Degree(angle), relativeTo); }
 
             virtual void lookAt(const Vector3& target, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL, const Vector3& localDirectionVector = Vector3::NEGATIVE_UNIT_Z) = 0;
@@ -131 +148 @@
             inline void setDirection_xmlport(const Vector3& direction)
                 { this->setDirection(direction); }
-            inline void yaw_xmlport(const Radian& angle)
+            inline void yaw_xmlport(const Degree& angle)
                 { this->yaw(angle); }
-            inline void pitch_xmlport(const Radian& angle)
+            inline void pitch_xmlport(const Degree& angle)
                 { this->pitch(angle); }
-            inline void roll_xmlport(const Radian& angle)
+            inline void roll_xmlport(const Degree& angle)
                 { this->roll(angle); }