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

Timestamp:

Aug 23, 2005, 11:13:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: reverted the last steps, because they created a huge pack of seg-faults

Location:

trunk/src/lib/coord

Files:

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

trunk/src/lib/coord/p_node.cc

@@ -79 +79 @@
 {
   tIterator<PNode>* iterator = this->children->getIterator();
-  PNode* pn = iterator->firstElement();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL)
     {
@@ -165 +165 @@
 void PNode::setRelCoor (const Vector& relCoord)
 {
-  if (this->toCoordinate!= NULL)
-  {
-    delete this->toCoordinate;
-    this->toCoordinate = NULL;
-  }
-
   this->relCoordinate = relCoord;
   this->bRelCoorChanged = true;
@@ -219 +213 @@
 void PNode::setAbsCoor (const Vector& absCoord)
 {
-  if (this->toCoordinate!= NULL)
-  {
-    delete this->toCoordinate;
-    this->toCoordinate = NULL;
-  }
-
   if( likely(this->parentMode & PNODE_MOVEMENT))
   {
@@ -288 +276 @@
 void PNode::setRelDir (const Quaternion& relDir)
 {
-  if (this->toDirection!= NULL)
-  {
-    delete this->toDirection;
-    this->toDirection = NULL;
-  }
   this->relDirection = relDir;
   this->bRelCoorChanged = true;
@@ -344 +327 @@
 void PNode::setAbsDir (const Quaternion& absDir)
 {
-  if (this->toDirection!= NULL)
-  {
-    delete this->toDirection;
-    this->toDirection = NULL;
-  }
-
   if (likely(this->parent != NULL))
     this->relDirection = absDir / this->parent->getAbsDir();
@@ -435 +412 @@
 
   tIterator<PNode>* iterator = this->children->getIterator();
-  PNode* pn = iterator->firstElement();
+  PNode* pn = iterator->nextElement();
 
   while( pn != NULL)
@@ -605 +582 @@
     {
       tIterator<PNode>* iterator = this->children->getIterator();
-      PNode* pn = iterator->firstElement();
+      PNode* pn = iterator->nextElement();
       while( pn != NULL)
       {
@@ -615 +592 @@
 
         pn->update(dt);
+          //pn = this->children->nextElement();
         pn = iterator->nextElement();
       }
@@ -655 +633 @@
     tIterator<PNode>* iterator = this->children->getIterator();
       //PNode* pn = this->children->enumerate ();
-    PNode* pn = iterator->firstElement();
+    PNode* pn = iterator->nextElement();
     while( pn != NULL)
     {
@@ -721 +699 @@
   if (depth >= 2 || depth == 0)
   {
+    tIterator<PNode>* iterator = this->children->getIterator();
+      //PNode* pn = this->children->enumerate ();
     Vector childColor =  Color::HSVtoRGB(Color::RGBtoHSV(color)+Vector(20,0,.0));
-
-    tIterator<PNode>* iterator = this->children->getIterator();
-    PNode* pn = iterator->firstElement();
+    PNode* pn = iterator->nextElement();
     while( pn != NULL)
     {

trunk/src/lib/coord/p_node.h

@@ -66 +66 @@
   /** @returns the relative position */
   inline const Vector& getRelCoor () const { return this->prevRelCoordinate; };
-  /** @returns the Relative Coordinate Destination */
-  inline const Vector& getRelCoorSoft2D() const { return (this->toCoordinate)?*this->toCoordinate:this->relCoordinate; };
   void setAbsCoor (const Vector& absCoord);
   void setAbsCoor (float x, float y, float z);
@@ -80 +78 @@
   /** @returns the relative Direction */
   inline const Quaternion& getRelDir () const { return this->prevRelDirection; };
-  /** @returns the Relative Directional Destination */
-  inline const Quaternion& getRelDirSoft2D() const { return (this->toDirection)?*this->toDirection:this->relDirection; };
   /** @returns a Vector pointing into the relative Direction */
   inline Vector getRelDirV() const { return this->prevRelDirection.apply(Vector(0,1,0)); };