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

Timestamp:

Dec 16, 2005, 7:13:57 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time
but specially merged the world to network_world

Location:

trunk/src/lib/coord

Files:

• p_node.cc (modified) (4 diffs)
• p_node.h (modified) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -81 +81 @@
     {
       deleteNode = tmp;
-      ++tmp;
+      tmp++;
 //      printf("TEST::%s(%s) %s\n", (*deleteNode)->getName(), (*deleteNode)->getClassName(), this->getName());
       if ((this->parentMode & PNODE_PROHIBIT_CHILD_DELETE) ||
@@ -470 +470 @@
               this->getClassName(), this->getName(), child->getClassName(), child->getName());
     child->parent = NULL;
+    child->parentCoorChanged();
   }
 }
@@ -536 +537 @@
     if (this->parentMode & PNODE_REPARENT_CHILDREN_ON_REMOVE ||
         (*reparenter)->parentMode & PNODE_REPARENT_ON_PARENTS_REMOVE)
-    {      printf("TEST----------------%s ---- %s\n", this->getClassName(), (*reparenter)->getClassName());
+    {
+      printf("TEST----------------%s ---- %s\n", this->getClassName(), (*reparenter)->getClassName());
       (*reparenter)->reparent();
       printf("REPARENTED TO: %s::%s\n",(*reparenter)->getParent()->getClassName(),(*reparenter)->getParent()->getName());
@@ -542 +544 @@
   }
   if (this->parent != NULL)
+  {
     this->parent->eraseChild(this);
+    this->parent = NULL;
+  }
 }
 

trunk/src/lib/coord/p_node.h

@@ -79 +79 @@
 
   // ACTIVATION //
-  inline void activateNode() { this->bActive = true; };
+  inline void activateNode() { this->bActive = this->bRelCoorChanged = this->bRelDirChanged = true; };
   inline void deactivateNode() { this->bActive = false; };
   inline bool getNodeActiveState() { return this->bActive; };