Changeset 11562 for code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h

Timestamp:

Nov 13, 2017, 5:25:09 PM (6 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.h (modified) (2 diffs)

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

@@ -17 +17 @@
 {
 
-class ScriptableController : public BaseObject, public Tickable
+class ScriptableController
 {
 public:
-    explicit ScriptableController(Context *context);
+    struct NearObjectHandler
+    {
+        NearObjectHandler(WorldEntity *otherObject, double distance, std::function<void (int, int)> callback)
+            : otherObject_(otherObject), distance_(distance), callback_(callback)
+        {}
+
+        WorldEntity *otherObject_;
+        double distance_;
+        std::function<void (int, int)> callback_;
+        std::list<std::unique_ptr<NearObjectHandler> >::iterator otherHandler_;
+    };
 
     int runScript(const std::string &file_path);
 
+    void setPlayer(PlayerInfo *player);
     void registerWorldEntity(int id, WorldEntity *obj);
     void registerControllableEntity(int id, ControllableEntity *obj);
@@ -30 +41 @@
     ControllableEntity *getControllableEntityByID(int id) const;
 
-    void registerTimeout(std::function<void (void)> callback, double timeout);
+    void addNearObjectHandler(int obj1, int obj2, double distance, std::function<void (int, int)> callback);
 
-    virtual void tick(float dt) override;
+    void objectMoved(WorldEntity *obj);
 
 private:
     std::list<std::unique_ptr<ScriptableControllerAPI> > apis_;
-    ControllableEntity *player_; // TODO
+    PlayerInfo *player_;
     std::map<int, WorldEntity*> worldEntities_;
     std::map<int, ControllableEntity*> controllabelEntities_;
-    std::list<std::pair<std::function<void (void)>, float> > timeouts;
+
+    std::map<WorldEntity*, std::list<std::unique_ptr<NearObjectHandler> > > nearObjectHandlers_;
 
     void printLuaError(lua_State *lua);