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

Timestamp:

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

Author:

kohlia

Message:

Near object, near point and at area work!

File:

• code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) (4 diffs)

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

@@ -3 +3 @@
 #include "luatb.h"
 #include "infos/PlayerInfo.h"
+#include "core/command/Executor.h"
 
 namespace orxonox
@@ -11 +12 @@
 {
     int ret;
+
+    // Not having a script specified at all is not an error
+    if(file_path.empty())
+        return 0;
 
     // Create a lua object
@@ -45 +50 @@
     this->apis_.push_back(std::unique_ptr<ScriptableControllerAPI>(api));
 
-    // Only the caller knows, when the end-of-life of the script is reached,
-    // so we give him control over when to destroy it.
     return 0;
 }
@@ -55 +58 @@
 }
 
-void ScriptableController::registerWorldEntity(int id, WorldEntity *obj)
+void ScriptableController::registerWorldEntity(std::string id, WorldEntity *entity)
 {
-    orxout(user_info) << "WorldEntity registered (id: " << id << ")" << std::endl;
-    this->worldEntities_[id] = obj;
+    this->worldEntities_[id] = entity;
 }
 
-void ScriptableController::registerControllableEntity(int id, ControllableEntity *obj)
+void ScriptableController::registerControllableEntity(std::string id, ControllableEntity *entity)
 {
-    orxout(user_info) << "ControllableEntity registered (id: " << id << ")" << std::endl;
-    this->worldEntities_[id] = obj;
+    this->worldEntities_[id] = entity;
 }
 
-WorldEntity *ScriptableController::getWorldEntityByID(int id) const
+WorldEntity *ScriptableController::getWorldEntityByID(std::string id) const
 {
-    if(id == 0)
+    if(id == "player" || id == "Player" || id == "PLAYER")
         return this->player_->getControllableEntity();
 
-    auto obj = this->worldEntities_.find(id);
-    return obj != this->worldEntities_.end() ? obj->second : nullptr;
+    auto entity = this->worldEntities_.find(id);
+    return entity != this->worldEntities_.end() ? entity->second : nullptr;
 }
 
-ControllableEntity *ScriptableController::getControllableEntityByID(int id) const
+ControllableEntity *ScriptableController::getControllableEntityByID(std::string id) const
 {
-    if(id == 0)
+    if(id == "player" || id == "Player" || id == "PLAYER")
         return this->player_->getControllableEntity();
 
-    auto obj = this->controllabelEntities_.find(id);
-    return obj != this->controllabelEntities_.end() ? obj->second : nullptr;
-}
-
-void ScriptableController::addNearObjectHandler(int obj1, int obj2, double distance, std::function<void (int,int)> callback)
-{
-    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::objectMoved(WorldEntity *obj)
-{
-    // Temp
-    return;
-
-    auto &nearObjectHandlers = this->nearObjectHandlers_[obj];
-    auto handler = nearObjectHandlers.begin();
-    while(handler != nearObjectHandlers.end())
-    {
-        WorldEntity *other = (*handler)->otherObject_;
-        if((obj->getPosition() - other->getPosition()).length() < (*handler)->distance_)
-        {
-            (*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
-        {
-            handler++;
-        }
-    }
+    auto entity = this->controllabelEntities_.find(id);
+    return entity != this->controllabelEntities_.end() ? entity->second : nullptr;
 }