Changeset 5769 in orxonox.OLD for trunk/src/lib/coord/p_node.cc

Timestamp:

Nov 24, 2005, 11:18:39 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: sync

File:

• trunk/src/lib/coord/p_node.cc (modified) (10 diffs)

trunk/src/lib/coord/p_node.cc

@@ -496 +496 @@
   if (child != NULL)
   {
-   child->remove();
+   child->removeNode();
 //   this->children->remove(child);
 //   child->parent = NULL;
@@ -507 +507 @@
  * this can be the case, if an entity in the world is being destroyed.
  */
-void PNode::remove()
+void PNode::removeNode()
 {
   tIterator<PNode>* iterator = this->children->getIterator();
@@ -513 +513 @@
 
   while( pn != NULL)
-    {
+  {
       NullParent::getInstance()->addChild(pn);
       pn = iterator->nextElement();
@@ -609 +609 @@
  * worry, normaly...
  */
-void PNode::update (float dt)
+void PNode::updateNode (float dt)
 {
   if( likely(this->parent != NULL))
@@ -698 +698 @@
           pn->parentDirChanged ();
 
-        pn->update(dt);
+        pn->updateNode(dt);
         pn = iterator->nextElement();
       }
@@ -708 +708 @@
 }
 
+
+void PNode::countChildNodes(int& nodes) const
+{
+  nodes++;
+  tIterator<PNode>* it = this->children->getIterator();
+  PNode* node = it->firstElement();
+  while(node != NULL)
+  {
+    node->countChildNodes(nodes);
+    node = it->nextElement();
+  }
+
+}
+
+
 /**
  *  displays some information about this pNode
@@ -714 +729 @@
  * @param level !! INTERNAL !! The n-th level of the Node we draw (this is internal and only for nice output).
  */
-void PNode::debug(unsigned int depth, unsigned int level) const
+void PNode::debugNode(unsigned int depth, unsigned int level) const
 {
   for (unsigned int i = 0; i < level; i++)
@@ -722 +737 @@
   else
     PRINT(0)(" -");
-  PRINT(0)("PNode(%s::%s) - absCoord: (%0.2f, %0.2f, %0.2f), relCoord(%0.2f, %0.2f, %0.2f), direction(%0.2f, %0.2f, %0.2f) - %s\n",
+
+  int childNodeCount = 0;
+  this->countChildNodes(childNodeCount);
+
+  PRINT(0)("PNode(%s::%s) - absCoord: (%0.2f, %0.2f, %0.2f), relCoord(%0.2f, %0.2f, %0.2f), direction(%0.2f, %0.2f, %0.2f) - %s - %d childs\n",
            this->getClassName(),
            this->getName(),
@@ -734 +753 @@
            this->getAbsDirV().y,
            this->getAbsDirV().z,
-           this->parentingModeToChar(parentMode));
+           this->parentingModeToChar(parentMode),
+           childNodeCount);
   if (depth >= 2 || depth == 0)
   {
@@ -743 +763 @@
     {
       if (depth == 0)
-        pn->debug(0, level + 1);
+        pn->debugNode(0, level + 1);
       else
-        pn->debug(depth - 1, level +1);
+        pn->debugNode(depth - 1, level +1);
       pn = iterator->nextElement();
     }