Changeset 11562

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

Files:

• libraries/tools/Timer.cc (modified) (3 diffs)
• libraries/tools/Timer.h (modified) (2 diffs)
• orxonox/Level.cc (modified) (4 diffs)
• orxonox/Level.h (modified) (2 diffs)
• orxonox/infos/HumanPlayer.cc (modified) (1 diff)
• orxonox/scriptablecontroller/scriptable_controller.cc (modified) (5 diffs)
• orxonox/scriptablecontroller/scriptable_controller.h (modified) (2 diffs)
• orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) (3 diffs)
• orxonox/scriptablecontroller/scriptable_controller_api.h (modified) (1 diff)
• orxonox/worldentities/MobileEntity.cc (modified) (2 diffs)
• orxonox/worldentities/WorldEntity.cc (modified) (2 diffs)
• orxonox/worldentities/WorldEntity.h (modified) (1 diff)

code/branches/ScriptableController_HS17/src/libraries/tools/Timer.cc

@@ -158 +158 @@
     }
 
+    Timer::Timer(float interval, bool bLoop, std::function<void ()> func, bool bKillAfterCall)
+    {
+        this->init();
+        RegisterObject(Timer);
+
+        this->setTimer(interval, bLoop, func, bKillAfterCall);
+    }
+
     /**
         @brief Initializes the Timer
@@ -193 +201 @@
         this->executor_ = executor;
         this->bActive_ = true;
+        this->isStdFunction_ = false;
 
         this->time_ = this->interval_;
         this->bKillAfterCall_ = bKillAfterCall;
 
-        executor->getFunctor()->setSafeMode(true);
+        if(executor != nullptr)
+            executor->getFunctor()->setSafeMode(true);
+    }
+
+    void Timer::setTimer(float interval, bool bLoop, std::function<void ()> func, bool bKillAfterCall)
+    {
+        // Without the cast, the call would be ambiguous, because nullptr is castable to
+        // both, ExecutorPtr and std::function.
+        this->setTimer(interval, bLoop, static_cast<ExecutorPtr>(nullptr), bKillAfterCall);
+        this->function_ = func;
+        this->isStdFunction_ = true;
     }
 
@@ -207 +226 @@
         bool temp = this->bKillAfterCall_; // to avoid errors with bKillAfterCall_=false and an exutors which destroy the timer
 
-        (*this->executor_)();
+        if(this->isStdFunction_)
+            this->function_();
+        else
+            (*this->executor_)();
 
         if (temp)

code/branches/ScriptableController_HS17/src/libraries/tools/Timer.h

@@ -108 +108 @@
 
             Timer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
+            Timer(float interval, bool bLoop, std::function<void (void)> func, bool bKillAfterCall = false);
 
             void setTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
+            void setTimer(float interval, bool bLoop, std::function<void (void)> func, bool bKillAfterCall = false);
 
             void run();
@@ -153 +155 @@
 
             ExecutorPtr executor_;  //!< The executor of the function that will be called when the time expires
+            std::function<void (void)> function_;
 
+            bool isStdFunction_;
             long long interval_;    //!< The time-interval in micro seconds
             bool bLoop_;            //!< If true, the executor gets called every @a interval seconds

code/branches/ScriptableController_HS17/src/orxonox/Level.cc

@@ -57 +57 @@
         this->xmlfilename_ = this->getFilename();
         this->xmlfile_ = nullptr;
+        this->controller_.reset(new ScriptableController());
     }
 
@@ -84 +85 @@
         XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
         XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
-
-        if(this->level_script_ != "")
-        {
-            this->controller_ = new ScriptableController(this->getContext());
-            this->controller_->runScript(this->level_script_);
-        }
     }
 
@@ -177 +172 @@
     {
         this->objects_.push_back(object);
-        if(this->controller_ != nullptr)
-            object->registerToScriptableController(this->controller_);
+        object->registerToScriptableController(this->controller_.get());
     }
 
@@ -214 +208 @@
         orxout(internal_info) << "player entered level (id: " << player->getClientID() << ", name: " << player->getName() << ')' << endl;
         player->switchGametype(this->getGametype());
+
+        if(player->isHumanPlayer() && player->isLocalPlayer())
+        {
+            this->getScriptableController()->setPlayer(player);
+            this->controller_->runScript(this->level_script_);
+        }
     }
 

code/branches/ScriptableController_HS17/src/orxonox/Level.h

@@ -57 +57 @@
             MeshLodInformation* getLodInfo(std::string meshName) const;
 
+            inline ScriptableController *getScriptableController(void)
+                { return this->controller_.get(); }
+
 
         private:
@@ -92 +95 @@
             std::map<std::string,MeshLodInformation*>  lodInformation_;
 
-            ScriptableController* controller_;
+            std::unique_ptr<ScriptableController> controller_;
             std::string           level_script_;
     };

code/branches/ScriptableController_HS17/src/orxonox/infos/HumanPlayer.cc

@@ -38 +38 @@
 #include "gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"
+#include "Level.h"
+#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox

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

code/branches/ScriptableController_HS17/src/orxonox/worldentities/MobileEntity.cc

@@ -36 +36 @@
 
 #include "Scene.h"
+#include "Level.h"
+#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox
@@ -113 +115 @@
 
         this->node_->setPosition(position);
+        this->getLevel()->getScriptableController()->objectMoved(this);
     }
 

code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.cc

@@ -184 +184 @@
         // Attached collision shapes
         XMLPortObject(WorldEntity, CollisionShape, "collisionShapes", attachCollisionShape, getAttachedCollisionShape, xmlelement, mode);
+
+        orxout(user_info) << "ID loaded" << std::endl;
     }
 
@@ -280 +282 @@
     void WorldEntity::registerToScriptableController(ScriptableController *controller)
     {
+        orxout(user_info) << "Registering object to SC (" << this->id_ << ")" << std::endl;
         controller->registerWorldEntity(this->id_, this);
     }

code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.h

@@ -110 +110 @@
             virtual void changedActivity(void) override;
             virtual void changedVisibility(void) override;
+
+            inline int getID(void)
+                { return this->id_; }
 
             inline void setID(int id)