Changeset 2374 for code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.h

Timestamp:

Dec 10, 2008, 1:38:17 PM (15 years ago)

Author:

rgrieder

Message:

Trying to synchronise phyiscs over the network.

• Removed derivation of CollisionShape from WorldEntity (BaseObject instead).

File:

• code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.h (modified) (5 diffs)

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

@@ -33 +33 @@
 
 #include "MovableEntity.h"
-#include "objects/Tickable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ControllableEntity : public MovableEntity, public Tickable
+    class _OrxonoxExport ControllableEntity : public MovableEntity
     {
         public:
@@ -72 +71 @@
             virtual void switchCamera();
 
-            inline const Vector3& getVelocity() const
-                { return this->velocity_; }
-            inline const Vector3& getAcceleration() const
-                { return this->acceleration_; }
             inline const std::string& getHudTemplate() const
                 { return this->hudtemplate_; }
-
-            inline void setAcceleration(const Vector3& acceleration)
-                { this->acceleration_ = acceleration; }
-            inline void setAcceleration(float x, float y, float z)
-                { this->acceleration_.x = x; this->acceleration_.y = y; this->acceleration_.z = z; }
 
             inline Camera* getCamera() const
@@ -109 +99 @@
                 { return this->bControlled_; }
 
-            Vector3 acceleration_;
-
         private:
             void overwrite();
@@ -116 +104 @@
 
             void processServerPosition();
-            void processServerVelocity();
+            void processServerLinearVelocity();
             void processServerOrientation();
+            void processServerAngularVelocity();
 
             void processClientPosition();
-            void processClientVelocity();
+            void processClientLinearVelocity();
             void processClientOrientation();
+            void processClientAngularVelocity();
 
-            void positionChanged();
-            void orientationChanged();
-            void velocityChanged();
+            void positionChanged       (bool bContinuous);
+            void orientationChanged    (bool bContinuous);
+            void linearVelocityChanged (bool bContinuous);
+            void angularVelocityChanged(bool bContinuous);
 
             void networkcallback_changedplayerID();
@@ -135 +126 @@
             Vector3 server_position_;
             Vector3 client_position_;
-            Vector3 server_velocity_;
-            Vector3 client_velocity_;
+            Vector3 server_linear_velocity_;
+            Vector3 client_linear_velocity_;
             Quaternion server_orientation_;
             Quaternion client_orientation_;
+            Vector3 server_angular_velocity_;
+            Vector3 client_angular_velocity_;
 
             PlayerInfo* player_;