- 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.cc
r11686 r11690 44 44 #include "core/XMLPort.h" 45 45 #include "Scene.h" 46 #include "Level.h"47 46 #include "collisionshapes/WorldEntityCollisionShape.h" 48 #include "scriptablecontroller/scriptable_controller.h"49 47 50 48 namespace orxonox … … 81 79 this->parentID_ = OBJECTID_UNKNOWN; 82 80 this->bDeleteWithParent_ = true; 83 this->id_ = -1;84 81 85 82 this->node_->setPosition(Vector3::ZERO); … … 163 160 XMLPortParamTemplate(WorldEntity, "scale3D", setScale3D, getScale3D, xmlelement, mode, const Vector3&); 164 161 XMLPortParam (WorldEntity, "scale", setScale, getScale, xmlelement, mode); 165 XMLPortParamLoadOnly(WorldEntity, "id", setID, xmlelement, mode);166 162 XMLPortParamLoadOnly(WorldEntity, "lookat", lookAt_xmlport, xmlelement, mode); 167 163 XMLPortParamLoadOnly(WorldEntity, "direction", setDirection_xmlport, xmlelement, mode); … … 185 181 // Attached collision shapes 186 182 XMLPortObject(WorldEntity, CollisionShape, "collisionShapes", attachCollisionShape, getAttachedCollisionShape, xmlelement, mode); 187 188 if(!this->id_.empty() && this->getLevel() != nullptr)189 this->getLevel()->getScriptableController()->registerWorldEntity(this->id_, this);190 183 } 191 184
Note: See TracChangeset
for help on using the changeset viewer.