- Timestamp:
- Nov 19, 2015, 11:40:28 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h
r10437 r10817 55 55 using WorldEntity::setOrientation; 56 56 57 void setPosition(const Vector3& position) ;58 void setOrientation(const Quaternion& orientation) ;57 void setPosition(const Vector3& position) override; 58 void setOrientation(const Quaternion& orientation) override; 59 59 60 60 private: 61 61 void registerVariables(); 62 bool isCollisionTypeLegal(CollisionType type) const ;62 bool isCollisionTypeLegal(CollisionType type) const override; 63 63 64 64 // network callbacks … … 69 69 70 70 // Bullet btMotionState related 71 void setWorldTransform(const btTransform& worldTrans) ;72 void getWorldTransform(btTransform& worldTrans) const ;71 void setWorldTransform(const btTransform& worldTrans) override; 72 void getWorldTransform(btTransform& worldTrans) const override; 73 73 }; 74 74 }
Note: See TracChangeset
for help on using the changeset viewer.