- Timestamp:
- Dec 18, 2017, 12:40:00 PM (6 years ago)
- Location:
- code/branches/Presentation_HS17
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17
- Property svn:mergeinfo changed
/code/branches/Waypoints_HS17 reverse-merged: 11496,11523,11539,11559,11582,11603,11633,11655,11657,11659,11661,11687 /code/branches/ScriptableController_HS17 removed
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.h
r11686 r11690 110 110 virtual void changedActivity(void) override; 111 111 virtual void changedVisibility(void) override; 112 113 inline std::string getID(void)114 { return this->id_; }115 116 inline void setID(std::string id)117 { this->id_ = id; }118 112 119 113 virtual void setPosition(const Vector3& position) = 0; … … 448 442 449 443 btRigidBody* physicalBody_; //!< Bullet rigid body. Everything physical is applied to this instance. 450 std::string id_; //!< Used by the ScriptableController to identify objects451 444 452 445 private:
Note: See TracChangeset
for help on using the changeset viewer.