Changeset 11928 for code/branches

Timestamp:

May 3, 2018, 1:46:20 PM (7 years ago)

Author:

adamc

Message:

Level & Script backup

Location:

code/branches/ScriptableController_FS18

Files:

• data/levels/AAAScriptableControllerTest.oxw (added)
• data/levels/BBBScriptableControllerTest.oxw (added)
• data/levels/scripts/AAAScriptableControllerTest.lua (added)
• data/levels/scripts/BBBScriptableControllerTest.lua (added)
• data/levels/scripts/empty.lua (added)
• data/levels/templates/AAAAutonomousDroneTemplate.oxt (added)
• src/orxonox/controllers/AutonomousDroneController.cc (added)
• src/orxonox/controllers/AutonomousDroneController.h (added)
• src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) (6 diffs)
• src/orxonox/worldentities/AutonomousDrone.cc (added)
• src/orxonox/worldentities/AutonomousDrone.h (added)
• src/orxonox/worldentities/pawns/AAAAutonomousDrone.cc (added)
• src/orxonox/worldentities/pawns/AAAAutonomousDrone.h (added)

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

@@ -152 +152 @@
         Identifiable *obj = identifier->fabricate(this->controller_->getWorldEntityByID("Player")->getContext());
 
+        orxout(user_error) << "First hit!" << std::endl;
+
         if(obj->isA(ClassIdentifier<WorldEntity>::getIdentifier()))
         {
@@ -173 +175 @@
         }
 
+        orxout(user_error) << "Second hit!" << std::endl;
+
         if(entity->isA(ClassIdentifier<MobileEntity>::getIdentifier()))
             this->controller_->registerMobileEntity(id, orxonox_cast<MobileEntity*>(entity));
@@ -180 +184 @@
 
         this->controller_->registerWorldEntity(id, orxonox_cast<WorldEntity*>(entity));
+
+        orxout(user_error) << "Third and final hit!" << std::endl;
     }
 
@@ -379 +385 @@
     }
 
+
+
+
+
     void ScriptableControllerAPI::moveControllableEntity(std::string id, double x, double y, double z)
     {
@@ -387 +397 @@
             return;
         }
-
-
 
 
@@ -395 +403 @@
         ControllableEntity *controllable_entity;
         
+
         if(identifier->isA(ClassIdentifier<ControllableEntity>::getIdentifier()))
         {
             controllable_entity = orxonox_cast<ControllableEntity*>(entity);
+
+            orxout(user_warning) << "Accessed " << id << std::endl;
 
             controllable_entity->moveFrontBack(x);