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

Timestamp:

Nov 20, 2017, 4:48:03 PM (7 years ago)

Author:

kohlia

Message:

Near object, near point and at area work!

File:

• code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h (modified) (2 diffs)

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

@@ -11 +11 @@
 #include "worldentities/WorldEntity.h"
 #include "worldentities/ControllableEntity.h"
+#include "tools/Timer.h"
 
 struct lua_State;
@@ -20 +21 @@
 {
 public:
-    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);
+    void registerWorldEntity(std::string id, WorldEntity *entity);
+    void registerControllableEntity(std::string id, ControllableEntity *entity);
 
-    WorldEntity *getWorldEntityByID(int id) const;
-    ControllableEntity *getControllableEntityByID(int id) const;
-
-    void addNearObjectHandler(int obj1, int obj2, double distance, std::function<void (int, int)> callback);
-
-    void objectMoved(WorldEntity *obj);
+    WorldEntity *getWorldEntityByID(std::string id) const;
+    ControllableEntity *getControllableEntityByID(std::string id) const;
 
 private:
     std::list<std::unique_ptr<ScriptableControllerAPI> > apis_;
     PlayerInfo *player_;
-    std::map<int, WorldEntity*> worldEntities_;
-    std::map<int, ControllableEntity*> controllabelEntities_;
-
-    std::map<WorldEntity*, std::list<std::unique_ptr<NearObjectHandler> > > nearObjectHandlers_;
+    std::map<std::string, WorldEntity*> worldEntities_;
+    std::map<std::string, ControllableEntity*> controllabelEntities_;
 
     void printLuaError(lua_State *lua);