Changeset 869 for code/branches/core/src/orxonox/objects/WorldEntity.h

Timestamp:

Mar 9, 2008, 4:04:23 AM (17 years ago)

Author:

landauf

Message:

cool shit's happening here… it works! wow. I wonder why, but hey, don't ask, just commit. this update might also be helpful for the network guys.

• fixed a bug in XMLPort
• fixed a bug in the MultiTypes
• implemented some XMLPort functions in Model, SpaceShip, Skybox and Ambient (and of course the WorldEntity), but this is just a workaround as all those classes are more or less just temporary solutions

File:

• code/branches/core/src/orxonox/objects/WorldEntity.h (modified) (5 diffs)

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

@@ -39 +39 @@
             inline void setPosition(const Vector3& pos)
                 { this->node_->setPosition(pos); }
-//            inline void setPosition(Real x, Real y, Real z)
-//                { this->node_->setPosition(x, y, z); }
+            inline void setPositionLoader1(const Vector3& pos)
+                { this->node_->setPosition(pos); }
+            inline void setPositionLoader2(Real x, Real y, Real z)
+                { this->node_->setPosition(x, y, z); }
+            inline void setPosition(Real x, Real y, Real z)
+                { this->node_->setPosition(x, y, z); }
             inline const Vector3& getPosition() const
                 { return this->node_->getPosition(); }
@@ -59 +63 @@
             inline void roll(const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
                 { this->node_->roll(angle, relativeTo); }
+            void setYawPitchRoll(const Degree& yaw, const Degree& pitch, const Degree& roll);
 
             inline void setYaw(const Degree &angle)
@@ -73 +78 @@
             inline void rotate(const Vector3 &axis, const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
               { this->node_->rotate(axis, angle, relativeTo); }
+            inline void setDirectionLoader(Real x, Real y, Real z)
+              { this->setDirection(x, y, z); }
             inline void setDirection(Real x, Real y, Real z, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
               { this->node_->setDirection(x, y, z, relativeTo, localDirectionVector); }
@@ -120 +127 @@
                 { return this->acceleration_; }
 
+            inline void setRotationAxisLoader(const Vector3& axis)
+                { this->rotationAxis_ = axis; }
             inline void setRotationAxis(const Vector3& axis)
                 { this->rotationAxis_ = axis; }
-//            inline void setRotationAxis(Real x, Real y, Real z)
-//                { this->rotationAxis_.x = x; this->rotationAxis_.y = y; this->rotationAxis_.z = z; }
+            inline void setRotationAxis(Real x, Real y, Real z)
+                { this->rotationAxis_.x = x; this->rotationAxis_.y = y; this->rotationAxis_.z = z; }
             inline const Vector3& getRotationAxis() const
                 { return this->rotationAxis_; }
@@ -130 +139 @@
 //                { this->rotationRate_ = angle; }
             inline void setRotationRate(const Degree& angle)
-                { this->rotationRate_ = angle; }
+                { this->rotationRate_ = angle; this->setStatic(angle == Degree(0)); }
             inline const Radian& getRotationRate() const
                 { return this->rotationRate_; }