Changeset 853 for code/branches/core/src/orxonox/objects

Timestamp:

Mar 5, 2008, 6:38:09 PM (17 years ago)

Author:

landauf

Message:

sync with notebook, there are some changes in the MultiTypes, XMLPort and the WorldEntity, but there's still a bug in some of the Converter-specializations

Location:

code/branches/core/src/orxonox/objects

Files:

• WorldEntity.cc (modified) (1 diff)
• WorldEntity.h (modified) (2 diffs)

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

@@ -172 +172 @@
         XMLPortParam(WorldEntity, "position", setPosition, getPosition, xmlelement, loading);
 //        XMLPortParam(WorldEntity, "direction", setDirection, getDirection, xmlelement, loading);
-//        XMLPortParam(WorldEntity, "yaw", yaw, getYaw, xmlelement, loading);
-//        XMLPortParam(WorldEntity, "pitch", pitch, getPitch, xmlelement, loading);
-//        XMLPortParam(WorldEntity, "roll", roll, getRoll, xmlelement, loading);
-        XMLPortParam(WorldEntity, "scale", setScale, getScale, xmlelement, loading);
+        XMLPortParamLoadOnly(WorldEntity, "yaw", setYaw, xmlelement, loading);
+        XMLPortParamLoadOnly(WorldEntity, "pitch", setPitch, xmlelement, loading);
+        XMLPortParamLoadOnly(WorldEntity, "roll", setRoll, xmlelement, loading);
+        XMLPortParam(WorldEntity, "scale", setTotalScale, getScale, xmlelement, loading);
         XMLPortParam(WorldEntity, "rotationAxis", setRotationAxis, getRotationAxis, xmlelement, loading);
         XMLPortParam(WorldEntity, "rotationRate", setRotationRate, getRotationRate, xmlelement, loading);

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

@@ -57 +57 @@
                 { this->node_->roll(angle, relativeTo); }
 
+            inline void setYaw(const Degree &angle)
+                { this->node_->yaw(angle, Ogre::Node::TS_LOCAL); }
+            inline void setPitch(const Degree &angle)
+                { this->node_->pitch(angle, Ogre::Node::TS_LOCAL); }
+            inline void setRoll(const Degree &angle)
+                { this->node_->roll(angle, Ogre::Node::TS_LOCAL); }
+
             inline const Ogre::Quaternion& getOrientation()
               { return this->node_->getOrientation(); }
@@ -75 +82 @@
               { this->node_->setScale(x, y, z); }
             inline void setScale(Real scale)
+              { this->node_->setScale(scale, scale, scale); }
+            inline void setTotalScale(Real scale)
               { this->node_->setScale(scale, scale, scale); }
             inline const Vector3& getScale(void) const