- Timestamp:
- Apr 12, 2018, 2:07:03 PM (6 years ago)
- Location:
- code/branches/ScriptableController_FS18
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/ScriptableController_FS18
- Property svn:mergeinfo changed
/code/branches/ScriptableController_HS17 (added) merged: 11462,11518-11519,11549,11552,11562,11583,11606,11638,11662,11673-11674,11684,11852,11854
- Property svn:mergeinfo changed
-
code/branches/ScriptableController_FS18/src/orxonox/worldentities/WorldEntity.h
r11099 r11855 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; } 112 118 113 119 virtual void setPosition(const Vector3& position) = 0; … … 442 448 443 449 btRigidBody* physicalBody_; //!< Bullet rigid body. Everything physical is applied to this instance. 450 std::string id_; //!< Used by the ScriptableController to identify objects 444 451 445 452 private:
Note: See TracChangeset
for help on using the changeset viewer.