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

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:

trunk/src/lib/coord

Files:

• p_node.cc (modified) (17 diffs)
• p_node.h (modified) (2 diffs)

trunk/src/lib/coord/p_node.cc

@@ -21 +21 @@
 #include "class_list.h"
 
+#include "netdefs.h"
+
 #include <algorithm>
 #include "compiler.h"
@@ -27 +29 @@
 #include "glincl.h"
 #include "color.h"
-
-#include "synchronizeable.h"
 
 /**
@@ -77 +77 @@
 PNode::~PNode ()
 {
-  PRINTF(4)("delete %s::%s\n", this->getClassName(), this->getName());
+  PRINTF(4)("delete %s::%s\n", this->getClassCName(), this->getCName());
   // remove the Node, delete it's children (if required).
   std::list<PNode*>::iterator deleteNode;
@@ -91 +91 @@
       {
         PRINTF(4)("%s::%s deletes %s::%s\n",
-                  this->getClassName(), this->getName(),
-                  (*deleteNode)->getClassName(), (*deleteNode)->getName());
+                  this->getClassCName(), this->getCName(),
+                  (*deleteNode)->getClassCName(), (*deleteNode)->getCName());
         delete (*deleteNode);
       }
@@ -98 +98 @@
       {
         PRINTF(4)("%s::%s reparents %s::%s\n",
-                  this->getClassName(), this->getName(),
-                  (*deleteNode)->getClassName(), (*deleteNode)->getName());
+                  this->getClassCName(), this->getCName(),
+                  (*deleteNode)->getClassCName(), (*deleteNode)->getCName());
         (*deleteNode)->reparent();
       }
@@ -106 +106 @@
     {
       PRINTF(4)("%s::%s deletes PNode: %s::%s\n",
-                this->getClassName(), this->getName(),
-                (*deleteNode)->getClassName(), (*deleteNode)->getName());
+                this->getClassCName(), this->getCName(),
+                (*deleteNode)->getClassCName(), (*deleteNode)->getCName());
       delete (*deleteNode);
     }
@@ -509 +509 @@
   {
     PRINTF(1)("Tried to reparent to own child '%s::%s' to '%s::%s'.\n",
-              this->getClassName(), this->getName(), child->getClassName(), child->getName());
+              this->getClassCName(), this->getCName(), child->getClassCName(), child->getCName());
     child->parent = NULL;
     child->parentCoorChanged();
@@ -519 +519 @@
 {
   PNode* tmpNode = node->parent;
-  printf("entering seek PNode loop for name: %s, uid: %i\n", node->getName(), node->getUniqueID());
+  printf("entering seek PNode loop for name: %s, uid: %i\n", node->getCName(), node->getUniqueID());
   if(tmpNode)
-    printf("  @node name: %s, uid: %d\n", tmpNode->getName(), tmpNode->getUniqueID());
+    printf("  @node name: %s, uid: %d\n", tmpNode->getCName(), tmpNode->getUniqueID());
   while( tmpNode != NULL && tmpNode->getUniqueID() == NET_UID_UNASSIGNED)
   {
-    printf("  @node name: %s, uid: %d\n", tmpNode->getName(), tmpNode->getUniqueID());
+    printf("  @node name: %s, uid: %d\n", tmpNode->getCName(), tmpNode->getUniqueID());
     tmpNode = tmpNode->parent;
   }
@@ -604 +604 @@
         (*reparenter)->parentMode & PNODE_REPARENT_ON_PARENTS_REMOVE)
     {
-      printf("TEST----------------%s ---- %s\n", this->getClassName(), (*reparenter)->getClassName());
+      printf("TEST----------------%s ---- %s\n", this->getClassCName(), (*reparenter)->getClassCName());
       (*reparenter)->reparent();
-      printf("REPARENTED TO: %s::%s\n",(*reparenter)->getParent()->getClassName(),(*reparenter)->getParent()->getName());
+      printf("REPARENTED TO: %s::%s\n",(*reparenter)->getParent()->getClassCName(),(*reparenter)->getParent()->getCName());
     }
   }
@@ -628 +628 @@
   else
     PRINTF(2)("Not Found PNode's (%s::%s) new Parent by Name: %s\n",
-        this->getClassName(), this->getName(), parentName.c_str());
+        this->getClassCName(), this->getCName(), parentName.c_str());
 }
 
@@ -785 +785 @@
           delete this->toCoordinate;
           this->toCoordinate = NULL;
-          PRINTF(5)("SmoothMove of %s finished\n", this->getName());
+          PRINTF(5)("SmoothMove of %s finished\n", this->getCName());
         }
       }
@@ -793 +793 @@
         if (unlikely (shiftLen >= 1.0))
           shiftLen = 1.0;
-        //printf("%s::%s %f\n", this->getClassName(), this->getName(), this->toStep );
+        //printf("%s::%s %f\n", this->getClassCName(), this->getName(), this->toStep );
         Quaternion rotQuat = Quaternion::quatSlerp(this->relDirection,*this->toDirection, shiftLen);
         if (this->relDirection.distance(rotQuat) > PNODE_ITERATION_DELTA)
@@ -804 +804 @@
           delete this->toDirection;
           this->toDirection = NULL;
-          PRINTF(5)("SmoothRotate of %s finished\n", this->getName());
+          PRINTF(5)("SmoothRotate of %s finished\n", this->getCName());
           this->bRelDirChanged = true;
         }
@@ -812 +812 @@
       this->lastAbsCoordinate = this->absCoordinate;
 
-      PRINTF(5)("PNode::update - '%s::%s' - (%f, %f, %f)\n", this->getClassName(), this->getName(),
+      PRINTF(5)("PNode::update - '%s::%s' - (%f, %f, %f)\n", this->getClassCName(), this->getCName(),
                 this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
 
@@ -840 +840 @@
     else // Nodes without a Parent are handled faster :: MOST LIKELY THE NULLPARENT
     {
-      PRINTF(4)("update ParentLess Node (%s::%s) - (%f, %f, %f)\n", this->getClassName(), this->getName(),
+      PRINTF(4)("update ParentLess Node (%s::%s) - (%f, %f, %f)\n", this->getClassCName(), this->getCName(),
                 this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
       if (this->bRelCoorChanged)
@@ -913 +913 @@
 
   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(),
+           this->getClassCName(),
+           this->getCName(),
            this->absCoordinate.x,
            this->absCoordinate.y,
@@ -1090 +1090 @@
 {
   Synchronizeable::varChangeHandler( id );
-  
+
   if ( std::find( id.begin(), id.end(), relCoordinate_handle ) != id.end() )
   {

trunk/src/lib/coord/p_node.h

@@ -20 +20 @@
 
 #include "base_object.h"
-#include "stdincl.h"
 #include "synchronizeable.h"
 
@@ -112 +111 @@
   /** @returns the absolute position */
   inline const Vector& getLastAbsCoor () const { return this->lastAbsCoordinate; };
-  
+
   void shiftCoor (const Vector& shift);
   void shiftCoor (float x, float y, float z) { this->shiftCoor(Vector(x, y, z)); };