Changeset 6873 in orxonox.OLD for trunk/src/lib/coord

Timestamp:

Jan 30, 2006, 10:43:00 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Emitter is emitting correctly

Location:

trunk/src/lib/coord

Files:

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

trunk/src/lib/coord/p_node.cc

@@ -139 +139 @@
 
   LoadParam(root, "parent", this, PNode, setParent)
-      .describe("the Name of the Parent of this PNode");
+      .describe("the Name of the Parent to set for this PNode");
 
   LoadParam(root, "parent-mode", this, PNode, setParentMode)
@@ -355 +355 @@
  * 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)));
+void PNode::setRelDir (float angle, float x, float y, float z)
+{
+  this->setRelDir(Quaternion(angle, Vector(x,y,z)));
 }
 
@@ -386 +386 @@
  * main difference is, that here you give a directional vector, that will be translated into a Quaternion
  */
-void PNode::setRelDirSoft(float x, float y, float z, float bias)
-{
-  this->setRelDirSoft(Quaternion(Vector(x,y,z), Vector(0,1,0)), bias);
+void PNode::setRelDirSoft(float angle, float x, float y, float z, float bias)
+{
+  this->setRelDirSoft(Quaternion(angle, Vector(x,y,z)), bias);
 }
 
@@ -421 +421 @@
  * 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)));
+void PNode::setAbsDir (float angle, float x, float y, float z)
+{
+  this->setAbsDir(Quaternion(angle, Vector(x,y,z)));
 }
 
@@ -456 +456 @@
  * main difference is, that here you give a directional vector, that will be translated into a Quaternion
  */
-void PNode::setAbsDirSoft (float x, float y, float z, float bias)
-{
-  this->setAbsDirSoft(Quaternion(Vector(x,y,z), Vector(0,1,0)), bias);
+void PNode::setAbsDirSoft (float angle, float x, float y, float z, float bias)
+{
+  this->setAbsDirSoft(Quaternion(angle, Vector(x,y,z)), bias);
 }
 
@@ -1319 +1319 @@
        fabs( rotz - absDirection.v.z ) > __OFFSET_ROT )
     return true;
-  
+
   return false;
 }

trunk/src/lib/coord/p_node.h

@@ -115 +115 @@
   // ROTATION //
   void setRelDir (const Quaternion& relDir);
-  void setRelDir (float x, float y, float z);
+  void setRelDir (float angle, float x, float y, float z);
   void setRelDirSoft(const Quaternion& relDirSoft, float bias = 1.0);
-  void setRelDirSoft(float x, float y, float z, float bias = 1.0);
+  void setRelDirSoft(float angle, float x, float y, float z, float bias = 1.0);
   /** @returns the relative Direction */
   inline const Quaternion& getRelDir () const { return this->prevRelDirection; };
@@ -125 +125 @@
   inline Vector getRelDirV() const { return this->prevRelDirection.apply(Vector(0,1,0)); };
   void setAbsDir (const Quaternion& absDir);
-  void setAbsDir (float x, float y, float z);
+  void setAbsDir (float angle, float x, float y, float z);
   void setAbsDirSoft(const Quaternion& absDirSoft, float bias = 1.0);
-  void setAbsDirSoft(float x, float y, float z, float bias = 1.0);
+  void setAbsDirSoft(float angle, float x, float y, float z, float bias = 1.0);
   void shiftDir (const Quaternion& shift);
   /** @returns the absolute Direction */