Changeset 11673 for code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc

Timestamp:

Dec 14, 2017, 4:04:14 PM (7 years ago)

Author:

kohlia

Message:

The ScriptableController should work now. A demo level called scriptableControllerTest exists as well.

File:

• code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) (9 diffs)

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

@@ -18 +18 @@
     this->controller_ = controller;
 
-    // Haven't found a shorter way yet to write that...
+    // Haven't found a shorter way yet to write that... We need C++17!
     LuaTB<ScriptableControllerAPI, decltype(&ScriptableControllerAPI::orxPrint)>::registerFunction<&ScriptableControllerAPI::orxPrint>(this, lua, "orxPrint");
 
@@ -101 +101 @@
 void ScriptableControllerAPI::killPawn(std::string id)
 {
-    // We don't kill the pawn here directly, because this function is called from LUA and thus
-    // runs in a different thread. So we schedule the kill for later in the main thread
-    // (in 'periodic').
-    this->pawnsToKill_.push_back(id);
+    Pawn *pawn = this->controller_->getPawnByID(id);
+    if(pawn == nullptr)
+        orxout(user_warning) << "Trying to kill an unknown pawn" << std::endl;
+    else
+        pawn->kill();
 }
 
@@ -168 +169 @@
     const Vector3 &old = entity->getPosition();
 
+    // If one of the values is NaN, don't change that value
     x = std::isnan(x) ? old.x : x;
     y = std::isnan(y) ? old.y : y;
@@ -189 +191 @@
     entity->getOrientation().ToAngleAxis(old_angle, old_axis);
 
+    // If one of the values is NaN, don't change that value
     x = std::isnan(x) ? old_axis.x : x;
     y = std::isnan(y) ? old_axis.y : y;
@@ -194 +197 @@
     angle = std::isnan(x) ? old_angle.valueDegrees() : angle;
 
+
     entity->setOrientation(Vector3(x, y, z), Degree(angle));
 }
@@ -208 +212 @@
     const Vector3 &old = entity->getVelocity();
 
+    // If one of the values is NaN, don't change that value
     x = std::isnan(x) ? old.x : x;
     y = std::isnan(y) ? old.y : y;
@@ -226 +231 @@
     const Vector3 &old = entity->getAngularVelocity();
 
+    // If one of the values is NaN, don't change that value
     x = std::isnan(x) ? old.x : x;
     y = std::isnan(y) ? old.y : y;
@@ -248 +254 @@
         else
             near_obj_handler++;
+    }
+
+    auto near_point_handler = this->nearPointHandlers_.begin();
+    while(near_point_handler != this->nearPointHandlers_.end())
+    {
+        if(near_point_handler->entity_ == pawn)
+            near_point_handler = this->nearPointHandlers_.erase(near_point_handler);
+        else
+            near_point_handler++;
+    }
+
+    auto area_handler = this->areaHandlers_.begin();
+    while(area_handler != this->areaHandlers_.end())
+    {
+        if(area_handler->entity_ == pawn)
+            area_handler = this->areaHandlers_.erase(area_handler);
+        else
+            area_handler++;
     }
 }
@@ -319 +343 @@
         }
     }
-
-    // Pawns to kill
-    // TODO Possible race condidtion when the player destroys the pawn
-    // between the callback and the next periodic call.
-    for(auto &pawn : this->pawnsToKill_)
-        this->controller_->killPawn(pawn);
-
-    this->pawnsToKill_.clear();
-}
-
-}
+}
+
+}