Changeset 4771 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jul 2, 2005, 1:33:32 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: PNode loading complete

Location:

orxonox/trunk/src/lib/coord

Files:

• p_node.cc (modified) (3 diffs)
• p_node.h (modified) (2 diffs)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -120 +120 @@
   static_cast<BaseObject*>(this)->loadParams(root);
 
+  LoadParam<PNode>(root, "rel-coor", this, &PNode::setRelCoor)
+      .describe("Sets The relative position of the Node to its parent.");
+
   LoadParam<PNode>(root, "abs-coor", this, &PNode::setAbsCoor)
       .describe("Sets The absolute Position of the Node.");
 
-  LoadParam<PNode>(root, "rel-coor", this, &PNode::setRelCoor)
-      .describe("Sets The relative position of the Node to its parent.");
+  LoadParam<PNode>(root, "rel-dir", this, &PNode::setRelDir)
+      .describe("Sets The relative rotation of the Node to its parent.");
+
+  LoadParam<PNode>(root, "abs-dir", this, &PNode::setAbsDir)
+      .describe("Sets The absolute rotation of the Node.");
 
   LoadParam<PNode>(root, "parent", this, &PNode::setParent)
@@ -242 +248 @@
 
 /**
+ * @see void PNode::setRelDir (const Quaternion& relDir)
+ * @param x the x direction
+ * @param y the y direction
+ * @param z the z direction
+ *
+ * main difference is, that here you give a directional vector, that will be translated into a Quaternion
+ */
+void PNode::setRelDir (float x, float y, float z)
+{
+  this->setRelDir(Quaternion(Vector(x,y,z), Vector(0,1,0)));
+}
+
+/**
    \brief sets the absolute direction (0,0,1)
    \param absDir absolute coordinates
@@ -253 +272 @@
   this->bAbsDirChanged = true;
   this->absDirection = absDir;
+}
+
+/**
+ * @see void PNode::setAbsDir (const Quaternion& relDir)
+ * @param x the x direction
+ * @param y the y direction
+ * @param z the z direction
+ *
+ * main difference is, that here you give a directional vector, that will be translated into a Quaternion
+ */
+void PNode::setAbsDir (float x, float y, float z)
+{
+  this->setAbsDir(Quaternion(Vector(x,y,z), Vector(0,1,0)));
 }
 

orxonox/trunk/src/lib/coord/p_node.h

@@ -71 +71 @@
 
   void setRelDir (const Quaternion& relDir);
+  void setRelDir (float x, float y, float z);
   /** \returns the relative Direction */
   inline const Quaternion& getRelDir () const { return this->relDirection; };
@@ -76 +77 @@
   inline Vector getRelDirV() const { return this->relDirection.apply(Vector(0,1,0)); };
   void setAbsDir (const Quaternion& absDir);
+  void setAbsDir (float x, float y, float z);
   /** \returns the absolute Direction */
   inline const Quaternion& getAbsDir () const { return this->absDirection; };