Changeset 2427 for code/branches/physics/src/orxonox/objects/worldentities/MobileEntity.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/MobileEntity.h (modified) (4 diffs)

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

@@ -47 +47 @@
             void registerVariables();
 
-            using WorldEntity::setPosition;
-            using WorldEntity::setOrientation;
+            virtual void setPosition(const Vector3& position);
+            virtual void setOrientation(const Quaternion& orientation);
 
-            void setPosition(const Vector3& position);
-            void setOrientation(const Quaternion& orientation);
-
-            void setVelocity(const Vector3& velocity);
+            virtual void setVelocity(const Vector3& velocity);
             inline void setVelocity(float x, float y, float z)
                 { this->setVelocity(Vector3(x, y, z)); }
@@ -59 +56 @@
                 { return this->linearVelocity_; }
 
-            void setAngularVelocity(const Vector3& velocity);
+            virtual void setAngularVelocity(const Vector3& velocity);
             inline void setAngularVelocity(float x, float y, float z)
                 { this->setAngularVelocity(Vector3(x, y, z)); }
@@ -88 +85 @@
 
         protected:
+            // Bullet btMotionState related
+            virtual void setWorldTransform(const btTransform& worldTrans);
+            void getWorldTransform(btTransform& worldTrans) const;
+
             Vector3 linearAcceleration_;
             Vector3 linearVelocity_;
@@ -94 +95 @@
 
         private:
-            virtual void positionChanged       (bool bContinuous) = 0;
-            virtual void orientationChanged    (bool bContinuous) = 0;
-            virtual void linearVelocityChanged (bool bContinuous) { }
-            virtual void angularVelocityChanged(bool bContinuous) { }
-
             virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
-
-            // Bullet btMotionState related
-            void setWorldTransform(const btTransform& worldTrans);
-            void getWorldTransform(btTransform& worldTrans) const;
     };
 }