- Timestamp:
- Nov 19, 2015, 11:40:28 AM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h
r10437 r10817 55 55 virtual ~MobileEntity(); 56 56 57 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;58 virtual void tick(float dt) ;57 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 58 virtual void tick(float dt) override; 59 59 60 virtual void setPosition(const Vector3& position) ;61 virtual void setOrientation(const Quaternion& orientation) ;60 virtual void setPosition(const Vector3& position) override; 61 virtual void setOrientation(const Quaternion& orientation) override; 62 62 63 63 virtual void setVelocity(const Vector3& velocity); 64 64 inline void setVelocity(float x, float y, float z) 65 65 { this->setVelocity(Vector3(x, y, z)); } 66 inline const Vector3& getVelocity() const 66 inline const Vector3& getVelocity() const override 67 67 { return this->linearVelocity_; } 68 68 /** … … 108 108 protected: 109 109 // Bullet btMotionState related 110 virtual void setWorldTransform(const btTransform& worldTrans) ;111 void getWorldTransform(btTransform& worldTrans) const ;110 virtual void setWorldTransform(const btTransform& worldTrans) override; 111 void getWorldTransform(btTransform& worldTrans) const override; 112 112 113 113 Vector3 linearAcceleration_; … … 117 117 118 118 private: 119 virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const ;119 virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const override; 120 120 }; 121 121 }
Note: See TracChangeset
for help on using the changeset viewer.