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

Timestamp:

Nov 6, 2017, 5:23:08 PM (7 years ago)

Author:

kohlia

Message:

Not working yet

File:

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

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

@@ -9 +9 @@
 {
 
-ScriptableControllerAPI *ScriptableControllerAPI::this_;
-
 ScriptableControllerAPI::ScriptableControllerAPI(lua_State *lua, ScriptableController *controller)
 {
     this->lua_ = lua;
     this->controller_ = controller;
-    ScriptableControllerAPI::this_ = this;
 
     // Haven't found a shorter way yet to write that...
-    LuaTB<ScriptableControllerAPI, decltype(&ScriptableControllerAPI::testOutput)>::registerFunction<&ScriptableControllerAPI::testOutput>(this, lua, "testOutput");
     LuaTB<ScriptableControllerAPI, decltype(&ScriptableControllerAPI::registerAfterTimeout)>::registerFunction<&ScriptableControllerAPI::registerAfterTimeout>(this, lua, "registerAfterTimeout");
     LuaTB<ScriptableControllerAPI, decltype(&ScriptableControllerAPI::registerAtNearObject)>::registerFunction<&ScriptableControllerAPI::registerAtNearObject>(this, lua, "registerAtNearObject");
@@ -32 +28 @@
 }
 
-void ScriptableControllerAPI::testOutput()
+void ScriptableControllerAPI::registerAfterTimeout(std::function<void (void)> callback, double timeout)
 {
-    orxout(user_info) << "Wheee!!!" << std::endl;
-}
-
-void ScriptableControllerAPI::registerAfterTimeout(std::function<void (void)> callback, int timeout_ms)
-{
-
+    this->controller_->registerTimeout(callback, timeout);
 }
 
 int ScriptableControllerAPI::registerAtNearObject(std::function<void (int, int)> callback, int obj1, int obj2, double distance)
 {
-
+    orxout(user_warning) << "Working!" << std::endl;
 }