Changeset 6536 in orxonox.OLD

Timestamp:

Jan 18, 2006, 1:34:53 PM (18 years ago)

Author:

rennerc

Message:

pnode

Location:

branches/network/src/lib/coord

Files:

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

branches/network/src/lib/coord/p_node.cc

@@ -1205 +1205 @@
   }
 
-  static float coorx = relCoordinate.x + 1;
-  static float coory = relCoordinate.y + 1;
-  static float coorz = relCoordinate.z + 1;
-
-  static float rotw = relDirection.w + 1;
-  static float rotx = relDirection.v.x + 1;
-  static float roty = relDirection.v.y + 1;
-  static float rotz = relDirection.v.z + 1;
-
   byte flags = 0;
   if ( fabs( coorx - relCoordinate.x ) > __OFFSET ||
@@ -1227 +1218 @@
 
   SYNCHELP_WRITE_BYTE( flags );
-  //PRINTF(0)("FLAGS = %d\n", flags);
-
-  coorx = relCoordinate.x;
-  coory = relCoordinate.y;
-  coorz = relCoordinate.z;
-
-
-  rotw = relDirection.w;
-  rotx = relDirection.v.x;
-  roty = relDirection.v.y;
-  rotz = relDirection.v.z;
-
+  PRINTF(0)("FLAGS = %d\n", flags);
 
   if ( flags & __FLAG_COOR )
@@ -1248 +1228 @@
     SYNCHELP_WRITE_FLOAT( this->relCoordinate.y );
     SYNCHELP_WRITE_FLOAT( this->relCoordinate.z );
+
+    coorx = relCoordinate.x;
+    coory = relCoordinate.y;
+    coorz = relCoordinate.z;
   }
 
@@ -1259 +1243 @@
     SYNCHELP_WRITE_FLOAT( this->relDirection.v.y );
     SYNCHELP_WRITE_FLOAT( this->relDirection.v.z );
+
+    rotw = relDirection.w;
+    rotx = relDirection.v.x;
+    roty = relDirection.v.y;
+    rotz = relDirection.v.z;
   }
 

branches/network/src/lib/coord/p_node.h

@@ -229 +229 @@
 
   static PNode*      nullParent;         //!< The ROOT of the main PNode Tree.
+
+  private:
+    float coorx;
+    float coory;
+    float coorz;
+
+    float rotw;
+    float rotx;
+    float roty;
+    float rotz;
 };