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

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

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

trunk/src/lib/coord/p_node.cc

@@ -54 +54 @@
     parent->addChild(this);
 
-  this->relCoordinate_handle = this->registerVarId( new SynchronizeableVector( &relCoordinate, &relCoordinate_write, "coordinate" ) );
-  this->relDirection_handle = this->registerVarId( new SynchronizeableQuaternion( &relDirection, &relDirection_write, "direction" ) );
+  this->relCoordinate_handle = this->registerVarId( new SynchronizeableVector( &relCoordinate, &relCoordinate_write, "coordinate", PERMISSION_SERVER ) );
+  this->relDirection_handle = this->registerVarId( new SynchronizeableQuaternion( &relDirection, &relDirection_write, "direction", PERMISSION_SERVER ) );
 }
 
@@ -487 +487 @@
 void PNode::addChild (PNode* child)
 {
+  if (unlikely(child->parent == this))
+    return;
   if( likely(child->parent != NULL))
     child->parent->eraseChild(child);
@@ -749 +751 @@
 {
   const PNode* parent = this;
+  if (this == NULL)
+    return true;
   while ( (parent = parent->getParent()) != NULL)
     if (unlikely(parent == checkParent))