Changeset 3269 in orxonox.OLD

Timestamp:

Dec 24, 2004, 4:34:14 PM (19 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: parenting now debugged, ready to be integrated into the framework.

Location:

orxonox/branches/parenting/src

Files:

• p_node.cc (modified) (8 diffs)
• p_node.h (modified) (1 diff)
• world.cc (modified) (3 diffs)

orxonox/branches/parenting/src/p_node.cc

@@ -48 +48 @@
 {
   this->absCoordinate = *absCoordinate;
-  this->relCoordinate = this->absCoordinate - this->parent->getAbsCoor ();
-  
+  this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
   
   this->children = new tList<PNode>();
-  this->bRelCoorChanged = false;
-  this->bAbsCoorChanged = true;
+  this->bRelCoorChanged = true;
+  this->bAbsCoorChanged = false;
   this->bRelDirChanged = true;
   this->bAbsDirChanged = false;
@@ -93 +92 @@
    has changed and won't update the children Nodes.
 */
-void PNode::setRelCoor (Vector relCoord)
-{
-  this->bRelCoorChanged = true;
-  this->relCoordinate = relCoord;
+void PNode::setRelCoor (Vector* relCoord)
+{
+  this->bRelCoorChanged = true;
+  this->relCoordinate = *relCoord;
 }
 
@@ -118 +117 @@
    has changed and won't update the children Nodes.
 */
-void PNode::setAbsCoor (Vector absCoord)
+void PNode::setAbsCoor (Vector* absCoord)
 {
   this->bAbsCoorChanged = true;
-  this->absCoordinate = absCoord;
+  this->absCoordinate = *absCoord;
 }
 
@@ -183 +182 @@
    has changed and won't update the children Nodes.
 */
-void PNode::setRelDir (Quaternion relDir)
-{
-  this->bRelCoorChanged = true;
-  this->relDirection = relDir;
+void PNode::setRelDir (Quaternion* relDir)
+{
+  this->bRelCoorChanged = true;
+  this->relDirection = *relDir;
 }
 
@@ -206 +205 @@
    has changed and won't update the children Nodes.
 */
-void PNode::setAbsDir (Quaternion absDir)
+void PNode::setAbsDir (Quaternion* absDir)
 {}
 
@@ -320 +319 @@
 void PNode::update (long timeStamp)
 {
-  printf("PNode::update() \n");
-  //if( this->parent != NULL)
-  //    {
       
       if( this->mode == MOVEMENT || this->mode == ALL)
@@ -328 +324 @@
           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 ();
@@ -333 +330 @@
           else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
             {
- printf("PNode::update() - inside: before: absCoord: (%f, %f, %f)\n", 
-         this->absCoordinate.x, 
-         this->absCoordinate.y,
-         this->absCoordinate.z);
-printf("PNode::update() - inside: before: relCoord: (%f, %f, %f)\n", 
-         this->relCoordinate.x, 
-         this->relCoordinate.y,
-         this->relCoordinate.z);
               /*this is bad style... must be deleted later - just for testing*/
               if( this->parent == NULL)
                 {
                 this->absCoordinate = this->relCoordinate;
-                printf("PNode::update() - insinde: NULL NULL NULL\n");
                 }
               else
                 this->absCoordinate = parent->getAbsCoor () + this->relCoordinate;            /* update the current absCoordinate */
- printf("PNode::update() - inside after: absCoord: (%f, %f, %f)\n", 
-         this->absCoordinate.x, 
-         this->absCoordinate.y,
-         this->absCoordinate.z);
-printf("PNode::update() - inside after: relCoord: (%f, %f, %f)\n", 
-         this->relCoordinate.x, 
-         this->relCoordinate.y,
-         this->relCoordinate.z);
             }
         }

orxonox/branches/parenting/src/p_node.h

@@ -42 +42 @@
 
   Vector getRelCoor ();
-  void setRelCoor (Vector relCoord);
+  void setRelCoor (Vector* relCoord);
   Vector getAbsCoor ();
-  void setAbsCoor (Vector absCoord);
+  void setAbsCoor (Vector* absCoord);
   void shiftCoor (Vector* shift);
 
   Quaternion getRelDir ();
-  void setRelDir (Quaternion relDir);
+  void setRelDir (Quaternion* relDir);
   Quaternion getAbsDir ();
-  void setAbsDir (Quaternion absDir);
+  void setAbsDir (Quaternion* absDir);
   void shiftDir (Quaternion* shift);
 

orxonox/branches/parenting/src/world.cc

@@ -575 +575 @@
 void World::debug()
 {
-  printf("World::debug() - starting debug\n");
+  printf ("World::debug() - starting debug\n");
   PNode* p1 = new PNode ();
   PNode* p2 = new PNode (new Vector(2, 2, 2), p1);
@@ -602 +602 @@
   p1->update (1);
 
-  printf("World::debug() - update\n");
+  printf ("World::debug() - update\n");
   p1->debug ();
   p2->debug ();
@@ -608 +608 @@
   p4->debug ();
 
-
+  p2->shiftCoor (new Vector(-1, -1, -1));
+  p1->update (2);
+
+  p1->debug ();
+  p2->debug ();
+  p3->debug ();
+  p4->debug ();
+
+  p2->setAbsCoor (new Vector(1,2,3));
+
+
+ p1->update (2);
+
+  p1->debug ();
+  p2->debug ();
+  p3->debug ();
+  p4->debug ();
   /*
   WorldEntity* entity;