Changeset 11562 for code/branches/ScriptableController_HS17/src/orxonox/worldentities

Timestamp:

Nov 13, 2017, 5:25:09 PM (7 years ago)

Author:

kohlia

Message:

Figuring out when the different things are ready in orxonox

Location:

code/branches/ScriptableController_HS17/src/orxonox/worldentities

Files:

• MobileEntity.cc (modified) (2 diffs)
• WorldEntity.cc (modified) (2 diffs)
• WorldEntity.h (modified) (1 diff)

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

@@ -36 +36 @@
 
 #include "Scene.h"
+#include "Level.h"
+#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox
@@ -113 +115 @@
 
         this->node_->setPosition(position);
+        this->getLevel()->getScriptableController()->objectMoved(this);
     }
 

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

@@ -184 +184 @@
         // Attached collision shapes
         XMLPortObject(WorldEntity, CollisionShape, "collisionShapes", attachCollisionShape, getAttachedCollisionShape, xmlelement, mode);
+
+        orxout(user_info) << "ID loaded" << std::endl;
     }
 
@@ -280 +282 @@
     void WorldEntity::registerToScriptableController(ScriptableController *controller)
     {
+        orxout(user_info) << "Registering object to SC (" << this->id_ << ")" << std::endl;
         controller->registerWorldEntity(this->id_, this);
     }

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

@@ -110 +110 @@
             virtual void changedActivity(void) override;
             virtual void changedVisibility(void) override;
+
+            inline int getID(void)
+                { return this->id_; }
 
             inline void setID(int id)