- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/orxonox/worldentities/MobileEntity.h
r11052 r11054 57 57 virtual ~MobileEntity(); 58 58 59 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;60 virtual void tick(float dt) ;59 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 60 virtual void tick(float dt) override; 61 61 62 virtual void setPosition(const Vector3& position) ;63 virtual void setOrientation(const Quaternion& orientation) ;62 virtual void setPosition(const Vector3& position) override; 63 virtual void setOrientation(const Quaternion& orientation) override; 64 64 65 65 virtual void setVelocity(const Vector3& velocity); 66 66 inline void setVelocity(float x, float y, float z) 67 67 { this->setVelocity(Vector3(x, y, z)); } 68 inline const Vector3& getVelocity() const68 virtual inline const Vector3& getVelocity() const override 69 69 { return this->linearVelocity_; } 70 70 /** … … 110 110 protected: 111 111 // Bullet btMotionState related 112 virtual void setWorldTransform(const btTransform& worldTrans) ;113 v oid getWorldTransform(btTransform& worldTrans) const;112 virtual void setWorldTransform(const btTransform& worldTrans) override; 113 virtual void getWorldTransform(btTransform& worldTrans) const override; 114 114 115 115 Vector3 linearAcceleration_; … … 119 119 120 120 private: 121 virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const ;121 virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const override; 122 122 }; 123 123 }
Note: See TracChangeset
for help on using the changeset viewer.