Changeset 11071 for code/trunk/src/orxonox/worldentities/StaticEntity.h
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/worldentities/StaticEntity.h
r11052 r11071 57 57 using WorldEntity::setOrientation; 58 58 59 v oid setPosition(const Vector3& position);60 v oid setOrientation(const Quaternion& orientation);59 virtual void setPosition(const Vector3& position) override; 60 virtual void setOrientation(const Quaternion& orientation) override; 61 61 62 62 private: 63 63 void registerVariables(); 64 bool isCollisionTypeLegal(CollisionType type) const;64 virtual bool isCollisionTypeLegal(CollisionType type) const override; 65 65 66 66 // network callbacks … … 71 71 72 72 // Bullet btMotionState related 73 v oid setWorldTransform(const btTransform& worldTrans);74 v oid getWorldTransform(btTransform& worldTrans) const;73 virtual void setWorldTransform(const btTransform& worldTrans) override; 74 virtual void getWorldTransform(btTransform& worldTrans) const override; 75 75 }; 76 76 }
Note: See TracChangeset
for help on using the changeset viewer.