Changeset 11686 for code/branches/Presentation_HS17/src/orxonox/worldentities/MobileEntity.cc

Timestamp:

Dec 17, 2017, 2:37:50 PM (7 years ago)

Author:

patricwi

Message:

merged scriptable controller but not tested

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/MobileEntity.cc (modified) (2 diffs)

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

@@ -36 +36 @@
 
 #include "Scene.h"
+#include "Level.h"
+#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox
@@ -72 +74 @@
                 this->setAngularVelocity(rotationAxis.normalisedCopy() * rotationRate.valueRadians());
         }
+
+        if(!this->id_.empty() && this->getLevel() != nullptr)
+            this->getLevel()->getScriptableController()->registerMobileEntity(this->id_, this);
     }