Changeset 10845 for code/branches/cpp11_v2/src/orxonox/worldentities

Timestamp:

Nov 23, 2015, 10:20:29 PM (10 years ago)

Author:

landauf

Message:

always use 'virtual' in the declaration of virtual functions even if they are inherited

Location:

code/branches/cpp11_v2/src/orxonox/worldentities

Files:

• ControllableEntity.h (modified) (2 diffs)
• MobileEntity.h (modified) (2 diffs)
• MovableEntity.h (modified) (2 diffs)
• StaticEntity.h (modified) (2 diffs)
• pawns/FpsPlayer.h (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h

@@ -141 +141 @@
             using MobileEntity::setAngularVelocity;
 
-            void setPosition(const Vector3& position) override;
-            void setOrientation(const Quaternion& orientation) override;
-            void setVelocity(const Vector3& velocity) override;
-            void setAngularVelocity(const Vector3& velocity) override;
+            virtual void setPosition(const Vector3& position) override;
+            virtual void setOrientation(const Quaternion& orientation) override;
+            virtual void setVelocity(const Vector3& velocity) override;
+            virtual void setAngularVelocity(const Vector3& velocity) override;
 
             inline bool hasLocalController() const
@@ -214 +214 @@
 
             // Bullet btMotionState related
-            void setWorldTransform(const btTransform& worldTrans) override;
+            virtual void setWorldTransform(const btTransform& worldTrans) override;
 
             unsigned int server_overwrite_;

code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h

@@ -64 +64 @@
             inline void setVelocity(float x, float y, float z)
                 { this->setVelocity(Vector3(x, y, z)); }
-            inline const Vector3& getVelocity() const override
+            virtual inline const Vector3& getVelocity() const override
                 { return this->linearVelocity_; }
             /**
@@ -109 +109 @@
             // Bullet btMotionState related
             virtual void setWorldTransform(const btTransform& worldTrans) override;
-            void getWorldTransform(btTransform& worldTrans) const override;
+            virtual void getWorldTransform(btTransform& worldTrans) const override;
 
             Vector3 linearAcceleration_;

code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h

@@ -52 +52 @@
             using WorldEntity::setOrientation;
 
-            inline void setPosition(const Vector3& position) override
+            virtual inline void setPosition(const Vector3& position) override
                 { MobileEntity::setPosition(position); this->overwrite_position_ = this->getPosition(); }
-            inline void setOrientation(const Quaternion& orientation) override
+            virtual inline void setOrientation(const Quaternion& orientation) override
                 { MobileEntity::setOrientation(orientation); this->overwrite_orientation_ = this->getOrientation(); }
 
@@ -79 +79 @@
         private:
             void registerVariables();
-            void clientConnected(unsigned int clientID) override;
-            void clientDisconnected(unsigned int clientID) override;
+            virtual void clientConnected(unsigned int clientID) override;
+            virtual void clientDisconnected(unsigned int clientID) override;
             void resynchronize();
 

code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h

@@ -55 +55 @@
             using WorldEntity::setOrientation;
 
-            void setPosition(const Vector3& position) override;
-            void setOrientation(const Quaternion& orientation) override;
+            virtual void setPosition(const Vector3& position) override;
+            virtual void setOrientation(const Quaternion& orientation) override;
 
         private:
             void registerVariables();
-            bool isCollisionTypeLegal(CollisionType type) const override;
+            virtual bool isCollisionTypeLegal(CollisionType type) const override;
 
             // network callbacks
@@ -69 +69 @@
 
             // Bullet btMotionState related
-            void setWorldTransform(const btTransform& worldTrans) override;
-            void getWorldTransform(btTransform& worldTrans) const override;
+            virtual void setWorldTransform(const btTransform& worldTrans) override;
+            virtual void getWorldTransform(btTransform& worldTrans) const override;
     };
 }

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h

@@ -69 +69 @@
             virtual void fire();
 
-            bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
 
             virtual void addedWeaponPack(WeaponPack* wPack);