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

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.h (modified) (2 diffs)

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

@@ -20 +20 @@
     ~ScriptableControllerAPI();
 
-    void testOutput(void);
+    void testOutput(std::function<void(std::string)> callback);
 
-    void registerAfterTimeout(std::function<void (void)> callback, int timeout_ms);
+    void registerAfterTimeout(std::function<void (void)> callback, double timeout);
     int registerAtNearObject(std::function<void(int, int)> callback, int obj1, int obj2, double distance);
     int registerAtAreaEnter(std::function<void (int)> callback, int obj, int x, int y, int z, int dx, int dy, int dz);
@@ -33 +33 @@
     int setObjectPosition(int obj, double x, double y, double z);
 
-    static ScriptableControllerAPI *this_;
-
 private:
     lua_State *lua_;