Changeset 11562 for code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller

Timestamp:

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

Author:

kohlia

Message:

Figuring out when the different things are ready in orxonox

Location:

code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller

Files:

• scriptable_controller.cc (modified) (5 diffs)
• scriptable_controller.h (modified) (2 diffs)
• scriptable_controller_api.cc (modified) (3 diffs)
• scriptable_controller_api.h (modified) (1 diff)

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

@@ -2 +2 @@
 #include "scriptable_controller.h"
 #include "luatb.h"
+#include "infos/PlayerInfo.h"
 
 namespace orxonox
 {
 
-RegisterUnloadableClass(ScriptableController);
-
 // Used https://csl.name/post/lua-and-cpp/ as a reference
-ScriptableController::ScriptableController(Context* context)
-    : BaseObject(context)
-{
-    RegisterObject(ScriptableController);
-}
-
 int ScriptableController::runScript(const std::string &file_path)
 {
@@ -57 +50 @@
 }
 
+void ScriptableController::setPlayer(PlayerInfo *player)
+{
+    this->player_ = player;
+}
+
 void ScriptableController::registerWorldEntity(int id, WorldEntity *obj)
 {
+    orxout(user_info) << "WorldEntity registered (id: " << id << ")" << std::endl;
     this->worldEntities_[id] = obj;
 }
@@ -64 +63 @@
 void ScriptableController::registerControllableEntity(int id, ControllableEntity *obj)
 {
+    orxout(user_info) << "ControllableEntity registered (id: " << id << ")" << std::endl;
     this->worldEntities_[id] = obj;
 }
@@ -69 +69 @@
 WorldEntity *ScriptableController::getWorldEntityByID(int id) const
 {
+    if(id == 0)
+        return this->player_->getControllableEntity();
+
     auto obj = this->worldEntities_.find(id);
     return obj != this->worldEntities_.end() ? obj->second : nullptr;
@@ -75 +78 @@
 ControllableEntity *ScriptableController::getControllableEntityByID(int id) const
 {
+    if(id == 0)
+        return this->player_->getControllableEntity();
+
     auto obj = this->controllabelEntities_.find(id);
     return obj != this->controllabelEntities_.end() ? obj->second : nullptr;
 }
 
-void ScriptableController::registerTimeout(std::function<void ()> callback, double timeout)
+void ScriptableController::addNearObjectHandler(int obj1, int obj2, double distance, std::function<void (int,int)> callback)
 {
-    this->timeouts.push_back(std::make_pair(callback, static_cast<float>(timeout)));
+    orxout(user_info) << "NearObject registering (id 1: " << obj1 << ", id 2: " << obj2 << ")" << std::endl;
+
+    WorldEntity *entity1 = this->getWorldEntityByID(obj1);
+    WorldEntity *entity2 = this->getWorldEntityByID(obj2);
+
+    NearObjectHandler *handler1 = new NearObjectHandler(entity2, distance, callback);
+    NearObjectHandler *handler2 = new NearObjectHandler(entity1, distance, callback);
+
+    this->nearObjectHandlers_[entity1].push_front(std::unique_ptr<NearObjectHandler>(handler1));
+    this->nearObjectHandlers_[entity2].push_front(std::unique_ptr<NearObjectHandler>(handler2));
+
+    handler1->otherHandler_ = this->nearObjectHandlers_[entity2].begin();
+    handler2->otherHandler_ = this->nearObjectHandlers_[entity1].begin();
 }
 
-void ScriptableController::tick(float dt)
+void ScriptableController::objectMoved(WorldEntity *obj)
 {
-    auto timeout = this->timeouts.begin();
+    // Temp
+    return;
 
-    while(timeout != this->timeouts.end())
+    auto &nearObjectHandlers = this->nearObjectHandlers_[obj];
+    auto handler = nearObjectHandlers.begin();
+    while(handler != nearObjectHandlers.end())
     {
-        timeout->second -= dt;
-        if(timeout->second <= 0)
+        WorldEntity *other = (*handler)->otherObject_;
+        if((obj->getPosition() - other->getPosition()).length() < (*handler)->distance_)
         {
-            timeout->first();
-            timeout = this->timeouts.erase(timeout);
+            (*handler)->callback_(obj->getID(), other->getID());
+
+            auto otherHandler = (*handler)->otherHandler_;
+            handler = nearObjectHandlers.erase(handler);
+            if(nearObjectHandlers.empty())
+                this->nearObjectHandlers_.erase(obj);
+
+            this->nearObjectHandlers_[other].erase(otherHandler);
+            if(this->nearObjectHandlers_[other].empty())
+                this->nearObjectHandlers_.erase(other);
         }
         else
         {
-            timeout++;
+            handler++;
         }
     }
-
-    Tickable::tick(dt);
 }
 

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);

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);
 }
 

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

@@ -22 +22 @@
     void testOutput(std::function<void(std::string)> callback);
 
+    void orxPrint(std::string msg);
     void registerAfterTimeout(std::function<void (void)> callback, double timeout);
     int registerAtNearObject(std::function<void(int, int)> callback, int obj1, int obj2, double distance);