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

Timestamp:

Mar 12, 2005, 8:45:59 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: parenting revisited. fixed some bugs some missunderstandings. made it a little more secure to use. still dev

Location:

orxonox/trunk/src/lib/coord

Files:

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

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

@@ -22 +22 @@
 
 #include "p_node.h"
-
+#include "null_parent.h"
 
 using namespace std;
@@ -259 +259 @@
 {}
 
-
-
 /**
    \brief adds a child and makes this node to a parent
@@ -282 +280 @@
 void PNode::addChild (PNode* pNode, parentingMode mode)
 {
-  pNode->mode = mode;
-  pNode->parent = this;
-  this->children->add (pNode);
+  if( pNode->parent == NULL )
+    {
+      pNode->mode = mode;
+      pNode->parent = this;
+      this->children->add (pNode);
+    }
+  else
+    {
+      PRINTF(1)("PNode::addChild() - this node has already been added - closed Loop MARK \n");
+    }
 }
 
@@ -295 +300 @@
 {
   this->children->remove (pNode);
+  pNode->parent = NULL;
 }
 
@@ -302 +308 @@
    \param parent the Parent to set
 */
+/*
 void PNode::setParent (PNode* parent)
 {
   parent->addChild(this);
 }
+*/
 
 /**
@@ -368 +376 @@
                 }
               else
-                this->absCoordinate = parent->getAbsCoor () + this->relCoordinate;            /* update the current absCoordinate */
+                this->absCoordinate = parent->getAbsCoor() + this->relCoordinate;             /* update the current absCoordinate */
             }
         }
       
-      if( this->mode == ROTATION && this->mode == ALL)
+      if( this->mode == ROTATION || this->mode == ALL)
         {
           if( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
             {
               /* if you have set the absolute coordinates this overrides all other changes */
-              this->relDirection = this->absDirection - parent->getAbsDir ();
+              this->relDirection = this->absDirection - parent->getAbsDir();
             }
           else if( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
             {
               /* update the current absDirection - remember * means rotation around sth.*/
-              this->absDirection = parent->getAbsDir () * this->relDirection;
+              this->absDirection = parent->getAbsDir() * this->relDirection;
             }
         }    
-      // }
   PNode* pn = this->children->enumerate();
   while( pn != NULL) 
@@ -457 +464 @@
   return this->objectName;
 }
+

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

@@ -64 +64 @@
   void addChild (PNode* pNode, parentingMode mode);
   void removeChild (PNode* pNode);
-  void setParent (PNode* parent);
+  //void setParent (PNode* parent);
   void parentCoorChanged ();
   void parentDirChanged ();
@@ -79 +79 @@
   void debug ();
 
+ protected:
   float timeStamp;         //!< this the timeStamp of when the abs{Coordinat, Direction} has been calculated
   char* objectName;        //!< The name of the Object