Changeset 11562 for code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc

Timestamp:

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

Author:

kohlia

Message:

Figuring out when the different things are ready in orxonox

File:

• code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) (3 diffs)

code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc

@@ -3 +3 @@
 #include "luatb.h"
 #include "scriptable_controller.h"
+#include "tools/Timer.h"
 
 namespace orxonox
@@ -13 +14 @@
 
     // Haven't found a shorter way yet to write that...
+    LuaTB<ScriptableControllerAPI, decltype(&ScriptableControllerAPI::orxPrint)>::registerFunction<&ScriptableControllerAPI::orxPrint>(this, lua, "orxPrint");
     LuaTB<ScriptableControllerAPI, decltype(&ScriptableControllerAPI::registerAfterTimeout)>::registerFunction<&ScriptableControllerAPI::registerAfterTimeout>(this, lua, "registerAfterTimeout");
     LuaTB<ScriptableControllerAPI, decltype(&ScriptableControllerAPI::registerAtNearObject)>::registerFunction<&ScriptableControllerAPI::registerAtNearObject>(this, lua, "registerAtNearObject");
@@ -26 +28 @@
 }
 
+void ScriptableControllerAPI::orxPrint(std::string msg)
+{
+    orxout(user_info) << msg << std::endl;
+}
+
 void ScriptableControllerAPI::registerAfterTimeout(std::function<void (void)> callback, double timeout)
 {
-    // TODO Extend timer class to accept std::function
-    this->controller_->registerTimeout(callback, timeout);
+    // Kills itself when the timer fires
+    new Timer(timeout, false, callback, true);
 }
 
 int ScriptableControllerAPI::registerAtNearObject(std::function<void (int, int)> callback, int obj1, int obj2, double distance)
 {
-
+    //this->controller_->addNearObjectHandler(obj1, obj1, distance, callback);
 }