Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/lib/coord/p_node.cc

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/lib/coord/p_node.cc (modified) (18 diffs)

orxonox/branches/levelloader/src/lib/coord/p_node.cc

@@ -13 +13 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: ...
-
-   \todo Null-Parent => center of the coord system - singleton
+   co-programmer: 
+
    \todo Smooth-Parent: delay, speed
-   \todo destroy the stuff again, delete...
-*/
-
+*/
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PNODE
 
 #include "p_node.h"
 
+#include "null_parent.h"
+#include "vector.h"
 
 using namespace std;
@@ -34 +35 @@
 PNode::PNode () 
 {
-  this->children = new tList<PNode>();
-  this->bRelCoorChanged = true;
-  this->bAbsCoorChanged = false;
-  this->bRelDirChanged = true;
-  this->bAbsDirChanged = false;
-  this->parent = NULL;
+  init(NULL);
+
+  NullParent* np = NullParent::getInstance();
+  np->addChild(this);
   this->objectName = NULL;
 }
@@ -51 +50 @@
 PNode::PNode (Vector* absCoordinate, PNode* parent )
 {
+  this->init(parent);
+
   this->absCoordinate = *absCoordinate;
-  this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
-  
-  this->children = new tList<PNode>();
-  this->bRelCoorChanged = true;
-  this->bAbsCoorChanged = false;
-  this->bRelDirChanged = true;
-  this->bAbsDirChanged = false;
-  this->parent = parent;
-  this->objectName = NULL;
-  
-  parent->addChild (this);
-}
-
+  if (parent != NULL)
+    {
+      this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+      parent->addChild (this);
+    }
+  else 
+    this->relCoordinate = Vector(0,0,0);
+}
 
 /**
@@ -80 +76 @@
   delete &this->absDirection;
   */
-  this->parent = NULL;
+  //this->parent = NULL;
   if( this->objectName) delete this->objectName;
   /* there is currently a problem with cleaning up - fix*/
-}
-
+
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      delete pn;
+      pn = this->children->nextElement();
+
+    }
+   
+  /* this deletes all children in the list */
+  delete this->children;
+
+  delete []this->objectName;
+}
+
+void PNode::init(PNode* parent)
+{
+  this->children = new tList<PNode>();
+  this->bRelCoorChanged = true;
+  this->bAbsCoorChanged = false;
+  this->bRelDirChanged = true;
+  this->bAbsDirChanged = false;
+  this->parent = parent; 
+  this->objectName = NULL;
+}
 
 /**
@@ -91 +110 @@
    cleans up all pnodes
 */
+/*
 void PNode::destroy ()
 {
@@ -99 +119 @@
       pn = this->children->nextElement();
     } 
+  // this deletes all children in the list 
   this->children->destroy ();
-}
-
+
+  static_cast<BaseObject*>(this)->destroy();
+}
+*/
 
 /**
@@ -262 +285 @@
 {}
 
-
-
 /**
    \brief adds a child and makes this node to a parent
@@ -283 +304 @@
    use this to add a child to this node.
 */
-void PNode::addChild (PNode* pNode, parentingMode mode)
-{
-  pNode->mode = mode;
+void PNode::addChild (PNode* pNode, int parentingMode)
+{
+  if( pNode->parent != NULL )
+    {
+      PRINTF(2)("PNode::addChild() - reparenting node: removing it and adding it again\n");
+      pNode->parent->children->remove(pNode);
+    }
+  pNode->mode = parentingMode;
   pNode->parent = this;
-  this->children->add (pNode);
+  this->children->add(pNode);
 }
 
@@ -294 +320 @@
    \brief removes a child from the node
    \param pNode the child to remove from this pNode.
+
+   Children from pNode will not be lost, they are referenced to NullPointer
 */
 void PNode::removeChild (PNode* pNode)
 {
+  pNode->remove();
   this->children->remove (pNode);
+  pNode->parent = NULL;
+}
+
+
+/**
+   \brief remove this pnode from the tree and adds all following to NullParent
+
+   this can be the case, if an entity in the world is been destroyed.
+*/
+void PNode::remove()
+{
+  NullParent* np = NullParent::getInstance();
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      this->children->remove(pn);
+      np->addChild(pn, pn->getMode());
+      pn = this->children->nextElement();
+    }
 }
 
@@ -307 +355 @@
 void PNode::setParent (PNode* parent)
 {
-  this->parent = parent;
-}
+  parent->addChild(this);
+}
+
 
 /**
@@ -314 +363 @@
    \param mode the mode of the bind-type.
 */
-void PNode::setMode (parentingMode mode)
-{
-  this->mode = mode;
+void PNode::setMode (int parentingMode)
+{
+  this->mode = parentingMode;
+}
+
+
+/**
+   \brief gets the mode of this parent manualy
+   \return the mode of the bind-type.
+*/
+int PNode::getMode()
+{
+  return this->mode;
 }
 
@@ -351 +410 @@
    worry, normaly...
 */
-void PNode::update (float timeStamp)
-{
-  printf ("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
-
-      if( this->mode == MOVEMENT || this->mode == ALL)
+void PNode::update ()
+{
+  PRINTF(2)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+  // printf("%s", this->objectName);
+  if(this->mode & PNODE_MOVEMENT )
+    {
+      if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
-          if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+          /* 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)
             {
-              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 ();
+              this->absCoordinate = this->relCoordinate;
             }
-          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 () + this->relCoordinate;            /* update the current absCoordinate */
-            }
+          else
+            this->absCoordinate = parent->getAbsCoor() + this->relCoordinate;         /* update the current absCoordinate */
         }
-      
-      if( this->mode == ROTATION && this->mode == ALL)
+    }
+  
+  if( this->mode & PNODE_LOCAL_ROTATE)
+    {
+      if( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
-          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 ();
-            }
-          else if( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
-            {
-              /* update the current absDirection - remember * means rotation around sth.*/
-              this->absDirection = parent->getAbsDir () * this->relDirection;
-            }
-        }    
-      // }
+          /* if you have set the absolute coordinates this overrides all other changes */
+          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;
+        }
+    }
+  
+  if( this->mode & PNODE_ROTATE_MOVEMENT)
+    {
+      if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+        {
+          /* 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) 
@@ -397 +473 @@
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
-      pn->update(timeStamp);
+      pn->update();
       pn = this->children->nextElement();
     }
@@ -415 +491 @@
 void PNode::processTick (float dt)
 {
-  this->tick (dt);
+  //this->tick (dt);
   PNode* pn = this->children->enumerate();
   while( pn != NULL) 
@@ -424 +500 @@
 }
 
-/**
-   \param dt time to tick
-*/
-void PNode::tick (float dt)
-{}
 
 /**
@@ -435 +506 @@
 void PNode::debug()
 {
-  printf("PNode::debug() - absCoord: (%f, %f, %f)\n", 
+  PRINTF(2)("PNode::debug() - absCoord: (%f, %f, %f)\n", 
          this->absCoordinate.x, 
          this->absCoordinate.y,
@@ -451 +522 @@
 void PNode::setName (const char* newName)
 {
-        int l = strlen( newName);
-        
-        if( this->objectName != NULL) delete this->objectName;
-        this->objectName = NULL;
-        
-        if( newName != NULL)
-        {
-                this->objectName = new char[l+1];
-                
-                for( int i = 0; i < l+1; i++)
-                        this->objectName[i] = newName[i];
-        }
+  if (this->objectName)
+    delete []this->objectName;
+  this->objectName = new char[strlen(newName)+1];
+  strcpy(this->objectName,newName);
 }
 
@@ -473 +536 @@
   return this->objectName;
 }
+