[Orxonox-commit 7294] r11911 - code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller

[adamc at orxonox.net]

Author: adamc
Date: 2018-04-26 15:59:49 +0200 (Thu, 26 Apr 2018)
New Revision: 11911

Modified:
   code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc
Log:
scriptablecontroller trying to fix the spawning of objects

Modified: code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc
===================================================================
--- code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc	2018-04-26 13:56:12 UTC (rev 11910)
+++ code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc	2018-04-26 13:59:49 UTC (rev 11911)
@@ -62,6 +62,19 @@
         new Timer(timeout, false, callback, true);
     }
 
+    //void ScriptableControllerAPI::registerPeriodically(std::function<void (void)> callback, double timeout)
+    //{
+    //    // Kills itself when the timer fires
+    //    new Timer(timeout, false, callback, true);
+    //}
+
+
+
+
+
+
+
+
     void ScriptableControllerAPI::registerAtNearObject(std::function<void (std::string, std::string)> callback, std::string id1, std::string id2, double distance)
     {
         WorldEntity *entity1 = this->controller_->getWorldEntityByID(id1);
@@ -147,6 +160,9 @@
             // TODO This does not work yet because somehow the controllable entity is not set
             // yet at this stage.
     //        entity = orxonox_cast<PlayerInfo*>(obj)->getControllableEntity();
+
+
+            //use TEMPLATES in the map to define objects that are not present on the map yet
             return;
         }
         else