Changeset 11583 for code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.cc

Timestamp:

Nov 20, 2017, 4:48:03 PM (6 years ago)

Author:

kohlia

Message:

Near object, near point and at area work!

File:

• code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.cc (modified) (3 diffs)

code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.cc

@@ -44 +44 @@
 #include "core/XMLPort.h"
 #include "Scene.h"
+#include "Level.h"
 #include "collisionshapes/WorldEntityCollisionShape.h"
 #include "scriptablecontroller/scriptable_controller.h"
@@ -185 +186 @@
         XMLPortObject(WorldEntity, CollisionShape, "collisionShapes", attachCollisionShape, getAttachedCollisionShape, xmlelement, mode);
 
-        orxout(user_info) << "ID loaded" << std::endl;
+        if(!this->id_.empty() && this->getLevel() != nullptr)
+            this->getLevel()->getScriptableController()->registerWorldEntity(this->id_, this);
     }
 
@@ -280 +282 @@
     }
 
-    void WorldEntity::registerToScriptableController(ScriptableController *controller)
-    {
-        orxout(user_info) << "Registering object to SC (" << this->id_ << ")" << std::endl;
-        controller->registerWorldEntity(this->id_, this);
-    }
-
     /**
     @brief