Changeset 10817 for code/branches/cpp11_v2/src/orxonox/collisionshapes
- Timestamp:
- Nov 19, 2015, 11:40:28 AM (9 years ago)
- Location:
- code/branches/cpp11_v2/src/orxonox/collisionshapes
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.h
r10765 r10817 61 61 virtual ~CollisionShape(); 62 62 63 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;63 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 64 64 65 65 /** -
code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h
r10768 r10817 61 61 virtual ~CompoundCollisionShape(); 62 62 63 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;63 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 64 64 65 65 void attach(CollisionShape* shape); … … 70 70 void updateAttachedShape(CollisionShape* shape); 71 71 72 virtual void changedScale() ;72 virtual void changedScale() override; 73 73 74 74 private: 75 75 void updatePublicShape(); 76 inline virtual btCollisionShape* createNewShape() const 76 inline virtual btCollisionShape* createNewShape() const override 77 77 { assert(false); return nullptr; } 78 78 -
code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h
r10624 r10817 46 46 47 47 protected: 48 virtual void updateParent() ;48 virtual void updateParent() override; 49 49 50 50 private: 51 void parentChanged() ;51 void parentChanged() override; 52 52 53 53 WorldEntity* worldEntityOwner_;
Note: See TracChangeset
for help on using the changeset viewer.