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

Timestamp:

Dec 13, 2008, 9:38:30 PM (15 years ago)

Author:

rgrieder

Message:

Changed the way setPosition, setVelocity, setOrientation and setAngularVelocity is handled in MobileEntity and upwards.
This allows to introduce a lost feature: Position of an enemy ship on the client can't be set anymore at all (local changes were allowed before).

File:

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

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

@@ -89 +89 @@
                 { return this->cameraPositionTemplate_; }
 
+            using WorldEntity::setPosition;
+            using WorldEntity::setOrientation;
+            using MobileEntity::setVelocity;
+            using MobileEntity::setAngularVelocity;
+
+            void setPosition(const Vector3& position);
+            void setOrientation(const Quaternion& orientation);
+            void setVelocity(const Vector3& velocity);
+            void setAngularVelocity(const Vector3& velocity);
+
         protected:
             virtual void startLocalControl();
@@ -113 +123 @@
             void processClientAngularVelocity();
 
-            void positionChanged       (bool bContinuous);
-            void orientationChanged    (bool bContinuous);
-            void linearVelocityChanged (bool bContinuous);
-            void angularVelocityChanged(bool bContinuous);
+            void networkcallback_changedplayerID();
 
-            void networkcallback_changedplayerID();
+            // Bullet btMotionState related
+            void setWorldTransform(const btTransform& worldTrans);
 
             unsigned int server_overwrite_;