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

Timestamp:

Oct 15, 2005, 8:22:30 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed a reparenting bug
made the naming more compliant

Location:

trunk/src/lib/coord

Files:

• p_node.cc (modified) (12 diffs)
• p_node.h (modified) (4 diffs)

trunk/src/lib/coord/p_node.cc

@@ -235 +235 @@
 }
 
+
 /**
  * @param absCoord set absolute coordinate
@@ -266 +267 @@
 }
 
+
 /**
  * @param x x-coordinate.
@@ -287 +289 @@
    someNode->shiftCoor(objectMovement);
 
-   elsewhere you would have to:
+   otherwise you would have to:
    PNode* someNode = ...;
    Vector objectMovement = calculateShift();
@@ -293 +295 @@
    Vector newCoor = currentCoor + objectMovement;
    someNode->setRelCoor(newCoor);
-
-   yea right... shorter...
  *
-*/
+ */
 void PNode::shiftCoor (const Vector& shift)
 {
@@ -405 +405 @@
  *  adds a child and makes this node to a parent
  * @param child child reference
- * @param parentMode on which changes the child should also change ist state
- *
  * use this to add a child to this node.
 */
-void PNode::addChild (PNode* child, int parentMode)
+void PNode::addChild (PNode* child)
 {
   if( likely(child->parent != NULL))
@@ -416 +414 @@
       child->parent->children->remove(child);
     }
-  child->parentMode = parentMode;
   child->parent = this;
   this->children->add(child);
@@ -461 +458 @@
   while( pn != NULL)
     {
-      NullParent::getInstance()->addChild(pn, pn->getParentMode());
+      NullParent::getInstance()->addChild(pn);
       pn = iterator->nextElement();
     }
@@ -494 +491 @@
  * @param bias the speed to iterate to this new Positions
  */
-void PNode::softReparent(PNode* parentNode, float bias)
-{
+void PNode::setParentSoft(PNode* parentNode, float bias)
+{
+  // return if the new parent and the old one match
   if (this->parent == parentNode)
     return;
 
+  // store the Valures to iterate to.
   if (likely(this->toCoordinate == NULL))
   {
@@ -517 +516 @@
   parentNode->addChild(this);
 
- if (this->parentMode & PNODE_ROTATE_MOVEMENT)
-   this->setRelCoor(this->parent->getAbsDir().inverse().apply(tmpV - this->parent->getAbsCoor()));
+ if (this->parentMode & PNODE_ROTATE_MOVEMENT && this->parent != NULL)
+   this->relCoordinate = this->parent->getAbsDir().inverse().apply(tmpV - this->parent->getAbsCoor());
  else
-   this->setRelCoor(tmpV - parentNode->getAbsCoor());
-
-  this->setRelDir(tmpQ / parentNode->getAbsDir());
+   this->relCoordinate = tmpV - parentNode->getAbsCoor();
+
+ this->relDirection = tmpQ / parentNode->getAbsDir();
 }
 
@@ -530 +529 @@
  * @param bias the speed to iterate to this new Positions
  */
-void PNode::softReparent(const char* parentName, float bias)
+void PNode::setParentSoft(const char* parentName, float bias)
 {
   PNode* parentNode = dynamic_cast<PNode*>(ClassList::getObject(parentName, CL_PARENT_NODE));
   if (parentNode != NULL)
-    this->softReparent(parentNode, bias);
+    this->setParentSoft(parentNode, bias);
 }
 
@@ -561 +560 @@
       if (unlikely(this->toCoordinate != NULL))
       {
-        Vector moveVect = (*this->toCoordinate - this->getRelCoor()) *fabsf(dt)*bias;
-
+        Vector moveVect = (*this->toCoordinate - this->relCoordinate) *fabsf(dt)*bias;
         if (likely(moveVect.len() >= PNODE_ITERATION_DELTA))
         {
@@ -701 +699 @@
    displays the PNode at its position with its rotation as a cube.
 */
-void PNode::debugDraw(unsigned int depth, float size, Vector color) const
+void PNode::debugDraw(unsigned int depth, float size, const Vector& color) const
 {
   glMatrixMode(GL_MODELVIEW);

trunk/src/lib/coord/p_node.h

@@ -96 +96 @@
 
 
-  void addChild (PNode* child, int parentingMode = PNODE_PARENT_MODE_DEFAULT);
+  void addChild (PNode* child);
   void addChild (const char* childName);
   void removeChild (PNode* child);
@@ -106 +106 @@
   PNode* getParent () const { return this->parent; };
 
-  void softReparent(PNode* parentNode, float bias = 1.0);
-  void softReparent(const char* parentName, float bias = 1.0);
+  void setParentSoft(PNode* parentNode, float bias = 1.0);
+  void setParentSoft(const char* parentName, float bias = 1.0);
 
   /** @param parentMode sets the parentingMode of this Node */
@@ -118 +118 @@
 
   void debug (unsigned int depth = 1, unsigned int level = 0) const;
-  void debugDraw(unsigned int depth = 1, float size = 1.0, Vector color = Vector(1,1,1)) const;
+  void debugDraw(unsigned int depth = 1, float size = 1.0, const Vector& color = Vector(1,1,1)) const;
 
 
@@ -150 +150 @@
   Vector          velocity;           //!< Saves the velocity.
 
-  Vector*         toCoordinate;       //!< a position to which to iterate. (This is used in conjunction with softReparent.and set*CoorSoft)
-  Quaternion*     toDirection;        //!< a direction to which to iterate. (This is used in conjunction with softReparent and set*DirSoft)
+  Vector*         toCoordinate;       //!< a position to which to iterate. (This is used in conjunction with setParentSoft.and set*CoorSoft)
+  Quaternion*     toDirection;        //!< a direction to which to iterate. (This is used in conjunction with setParentSoft and set*DirSoft)
   float           bias;               //!< how fast to iterate to the given position (default is 1)