Changeset 11974 for code

Timestamp:

May 17, 2018, 4:04:14 PM (7 years ago)

Author:

adamc

Message:

can

Location:

code/branches/ScriptableController_FS18

Files:

• data/levels/AAAScriptableControllerTest.oxw (modified) (2 diffs)
• data/levels/scripts/AAAScriptableControllerTest.lua (modified) (3 diffs)
• data/levels/templates/AAAAutonomousDroneTemplate.oxt (modified) (1 diff)
• src/orxonox/Level.cc (modified) (1 diff)
• src/orxonox/Level.h (modified) (1 diff)
• src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) (1 diff)
• src/orxonox/scriptablecontroller/scriptable_controller.h (modified) (2 diffs)
• src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) (2 diffs)
• src/orxonox/scriptablecontroller/scriptable_controller_api.h (modified) (1 diff)

code/branches/ScriptableController_FS18/data/levels/AAAScriptableControllerTest.oxw

@@ -16 +16 @@
   include("templates/spaceshipEscort.oxt")
   include("templates/endurancetest_template.oxt")
+  include("templates/AAAAutonomousDroneTemplate.oxt")
 ?>
 
@@ -31 +32 @@
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="100,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+    <!-- <SpawnPoint team=2 position="0,0,0" lookat="0,0,0" spawnclass=AAAAutonomousDrone pawndesign=AAAAutonomousDroneTemplate />  -->
+    
 
-
-  <AAAAutonomousDrone id="dummy" position="0,0,0">
-    <attached>
-      <Model scale="10" mesh="drone.mesh"/>
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
-    </collisionShapes>
-  </AAAAutonomousDrone>
     
   

code/branches/ScriptableController_FS18/data/levels/scripts/AAAScriptableControllerTest.lua

@@ -60 +60 @@
 
 
+function spawn_dummy()
+        orxPrint("Spawning dummy!")
+        spawnTest("dummy")
+end
+
+
 function kill_player_after_timeout(pawn)
         orxPrint("Killing player after 5s")
@@ -86 +92 @@
 
 
+function spawn_dummy_after_timeout(seconds)
+        orxPrint("Spawning dummy after " .. tostring(seconds))
+        registerAfterTimeout(spawn_dummy, seconds)
+end
 
 
-move_dummy_after_timeout(5)
-kill_dummy_after_timeout(10)
 
 
@@ -96 +104 @@
 
 
-spawn("ModularSpaceShip", "sepp")
-setPosition("sepp", 500, 0, 0)
+spawn_dummy_after_timeout(5)
+
+

code/branches/ScriptableController_FS18/data/levels/templates/AAAAutonomousDroneTemplate.oxt

@@ +1 @@
+<Template name=AAAAutonomousDroneTemplate>
+  <AAAAutonomousDrone>
+    <attached>
+      <Model scale="10" position="0,0,0" mesh="drone.mesh"/>
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
+    </collisionShapes>
+  </AAAAutonomousDrone>
+</Template>

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

@@ -58 +58 @@
         this->xmlfile_ = nullptr;
         this->controller_.reset(new ScriptableController());
+        this->controller_->level_ = this;
     }
 

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

@@ -63 +63 @@
                 { return this->level_script_; }
 
+            void addObject(BaseObject* object);
 
         private:
             void registerVariables();
-            void addObject(BaseObject* object);
+            //void addObject(BaseObject* object);
             BaseObject* getObject(unsigned int index) const;
 

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

@@ -133 +133 @@
 Pawn *ScriptableController::getPawnByID(std::string id) const
 {
-    if(id == "player" || id == "Player" || id == "PLAYER")
+    if(id == "player" || id == "Player" || id == "PLAYER") {
         return orxonox_cast<Pawn*>(this->player_->getControllableEntity());
+        orxout(user_status) << "Pawn is player!?" << std::endl;
+    }
+
 
     auto pawn = this->pawns_.find(id);
+
+    if(pawn != this->pawns_.end()) {
+        orxout(user_status) << "Requested Pawn is available!" << std::endl;
+    }
+
     return pawn != this->pawns_.end() ? pawn->second : nullptr;
 }

code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.h

@@ -12 +12 @@
 #include "worldentities/ControllableEntity.h"
 #include "tools/Timer.h"
+#include "Level.h"
 
 struct lua_State;
@@ -31 +32 @@
 {
 public:
+    Level* level_ = nullptr;
     /**
      * @brief Run a lua script

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

@@ -37 +37 @@
         LuaTB<ScriptableControllerAPI, decltype(&ScriptableControllerAPI::spawn)>::registerFunction<&ScriptableControllerAPI::spawn>(this, lua, "spawn");
 
+        LuaTB<ScriptableControllerAPI, decltype(&ScriptableControllerAPI::spawnTest)>::registerFunction<&ScriptableControllerAPI::spawnTest>(this, lua, "spawnTest");
+
 
 
@@ -185 +187 @@
         this->controller_->registerWorldEntity(id, orxonox_cast<WorldEntity*>(entity));
 
+
         orxout(user_error) << "Third and final hit!" << std::endl;
-    }
+
+    }
+
+
+
+
+
+    void ScriptableControllerAPI::spawnTest(std::string id)
+    {
+        
+        if(this->controller_->getWorldEntityByID(id) != nullptr)
+        {
+            orxout(user_warning) << "Script tried to spawn an object, but an object with the given ID exists already" << std::endl;
+            return;
+        }
+        
+
+        Identifier *identifier = ClassByString("AAAAutonomousDrone");
+        
+        
+        if(!identifier)
+        {
+            orxout(user_error) << "Script tried to spawn unknown object" << std::endl;
+            return;
+        }
+
+        if(!identifier->isLoadable())
+        {
+            orxout(user_error) << "Script tried to spawn unloadable object" << std::endl;
+            return;
+        }
+
+        
+
+        WorldEntity *entity;
+        Identifiable *obj = identifier->fabricate(this->controller_->getWorldEntityByID("Player")->getContext());
+
+        orxout(user_status) << "First hit!" << std::endl;
+
+        if(obj->isA(ClassIdentifier<WorldEntity>::getIdentifier()))
+        {
+            orxout(user_status) << "Is WorldEntity!" << std::endl;
+            entity = orxonox_cast<WorldEntity*>(obj);
+        }
+        else if(obj->isA(ClassIdentifier<PlayerInfo>::getIdentifier()))
+        {
+            // TODO This does not work yet because somehow the controllable entity is not set
+            // yet at this stage.
+    //        entity = orxonox_cast<PlayerInfo*>(obj)->getControllableEntity();
+
+            orxout(user_status) << "Is PlayerInfo!" << std::endl;
+
+            //use TEMPLATES in the map to define objects that are not present on the map yet
+            return;
+        }
+        else
+        {
+            orxout(user_warning) << "Script tried to spawn an object that is neither a WorldEntity, nor a PlayerInfo" << std::endl;
+            
+            return;
+        }
+
+
+        if(entity->isA(ClassIdentifier<MobileEntity>::getIdentifier())) {
+            orxout(user_status) << "Is MobileEntity!" << std::endl;
+            this->controller_->registerMobileEntity(id, orxonox_cast<MobileEntity*>(entity));
+        }
+
+        if(entity->isA(ClassIdentifier<Pawn>::getIdentifier())) {
+            orxout(user_status) << "Is Pawn!" << std::endl;
+            this->controller_->registerPawn(id, orxonox_cast<Pawn*>(entity));
+        }
+
+        this->controller_->registerWorldEntity(id, orxonox_cast<WorldEntity*>(entity));
+
+        if(this->controller_->getPawnByID(id) != nullptr) {
+            orxout(user_status) << "Pawn is indeed available!" << std::endl;
+        }
+
+        //for (Level* level : ObjectList<Level>())
+        //    level->loadedNewXMLName(this);
+
+
+
+
+
+        /////!!!!!!!!!!!!!!!
+
+        this->controller_->level_->addObject(orxonox_cast<Pawn*>(entity));
+
+
+
+
+        orxout(user_status) << "Final hit!" << std::endl;
+    }
+
+
+
+
+
 
     void ScriptableControllerAPI::setPosition(std::string id, double x, double y, double z)

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

@@ -152 +152 @@
     void spawn(std::string type, std::string id);
 
+    void spawnTest(std::string id);
+
     /**
      * @brief Set the position of an object