Changeset 2990 for code/branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.h

Timestamp:

May 19, 2009, 9:35:10 PM (16 years ago)

Author:

scheusso

Message:

merged netp2 → netp3

Location:

code/branches/netp3

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/ControllableEntity.h (modified) (1 diff)

code/branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -164 +164 @@
             bool bDestroyWhenPlayerLeft_;
 
-            Vector3 server_position_;
-            Vector3 client_position_;
-            Vector3 server_linear_velocity_;
-            Vector3 client_linear_velocity_;
-            Quaternion server_orientation_;
-            Quaternion client_orientation_;
-            Vector3 server_angular_velocity_;
-            Vector3 client_angular_velocity_;
+//             Vector3 server_position_;
+            Vector3 common_position_;
+//             Vector3 client_position_;
+//             Vector3 server_linear_velocity_;
+//             Vector3 client_linear_velocity_;
+            Vector3 common_linear_velocity_;
+//             Quaternion server_orientation_;
+//             Quaternion client_orientation_;
+            Quaternion common_orientation_;
+//             Vector3 server_angular_velocity_;
+//             Vector3 client_angular_velocity_;
+            Vector3 common_angular_velocity_;
 
             PlayerInfo* player_;