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

Timestamp:

May 21, 2009, 1:18:46 AM (16 years ago)

Author:

scheusso

Message:

reverted changes of ControllableEntity
synchronisation now again with server and client values and overwrites (unidirectional)
problem with bidirectional synchronisation was the combination with bullet (lots of changes of client ships on the server side and thus lag in synchronisation)

File:

• code/branches/netp3/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 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_;
+            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_;
 
             PlayerInfo* player_;