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

Timestamp:

Mar 13, 2005, 11:30:11 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed another bug in list-template and added patch from bensch to the pnode to enable the different rotation modes

Location:

orxonox/trunk/src/lib

Files:

• coord/p_node.cc (modified) (2 diffs)
• util/list.h (modified) (1 diff)

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

@@ -396 +396 @@
   // printf("%s", this->objectName);
 
-      if( this->mode == MOVEMENT || this->mode == ALL)
+      if( this->mode == MOVEMENT )
         {
           if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
@@ -428 +428 @@
               this->absDirection = parent->getAbsDir() * this->relDirection;
             }
-        }    
+        }
+      
+      if( this->mode == ALL)
+        {
+          if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+            {
+              printf("PNode::update () - this->bAbsCoorChanged = true\n");
+              /* if you have set the absolute coordinates this overrides all other changes */
+              this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+            }
+          else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+            {
+              /*this is bad style... must be deleted later - just for testing*/
+              if( this->parent == NULL)
+                this->absCoordinate = this->relCoordinate;
+              else
+                this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate);          /* update the current absCoordinate */
+            }
+        }
+
+
   PNode* pn = this->children->enumerate();
   while( pn != NULL) 

orxonox/trunk/src/lib/util/list.h

@@ -137 +137 @@
           delete this->currentEl;
           this->currentEl = te;
+          this->size--;
           return;
         }