Changeset 11999

Timestamp:

May 24, 2018, 3:59:22 PM (6 years ago)

Author:

adamc

Message:

Spawning pawn works now, BUT still incompatible with moving spawned pawn

Location:

code/branches/ScriptableController_FS18

Files:

• data/levels/AAAScriptableControllerTest.oxw (modified) (1 diff)
• data/levels/BBBScriptableControllerTest.oxw (modified) (1 diff)
• data/levels/scripts/AAAScriptableControllerTest.lua (modified) (2 diffs)
• data/levels/templates/AAAAutonomousDroneTemplate.oxt (modified) (1 diff)
• src/libraries/core/BaseObject.cc (modified) (1 diff)
• src/orxonox/Level.h (modified) (1 diff)
• src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) (5 diffs)

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

@@ -1 +1 @@
 <LevelInfo
- name = "AAAScriptableControllerTest"
- description = "Demonstrates moving and killing a drone by use of a script."
+ name = "Scriptable Controller Moving and Killing Pawn"
+ description = "Demonstrates moving and killing a drone by using a lua script."
  tags = "test"
  screenshot = "emptylevel.png"

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

@@ -1 +1 @@
 <LevelInfo
- name = "BBBScriptableControllerTest"
- description = "Demonstrates moving and killing a drone by use of a script."
+ name = "Scriptable Controller Spawning Pawn"
+ description = "Demonstrates spawning a drone by using a lua script."
  tags = "test"
  screenshot = "emptylevel.png"

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

@@ -63 +63 @@
         orxPrint("Spawning dummy!")
         spawnTest("dummy")
+        move_dummy()
 end
 
@@ -107 +108 @@
 
 
+

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

@@ -2 +2 @@
   <AAAAutonomousDrone>
     <attached>
-      <Model scale="10" position="0,0,0" mesh="drone.mesh"/>
+      <Model scale="10" mesh="drone.mesh"/>
     </attached>
     <collisionShapes>

code/branches/ScriptableController_FS18/src/libraries/core/BaseObject.cc

@@ -77 +77 @@
         {
             this->setFile(this->creator_->getFile());
-
+            
             // store strong-pointers on all four base objects by default (can be overwritten with weak-ptr after the constructor if necessary)
             this->setNamespace(this->creator_->namespace_.createStrongPtr());

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

@@ -64 +64 @@
 
             void addObject(BaseObject* object);
+            BaseObject* getObject(unsigned int index) const;
 
         private:
             void registerVariables();
             //void addObject(BaseObject* object);
-            BaseObject* getObject(unsigned int index) const;
+            //BaseObject* getObject(unsigned int index) const;
 
             void addLodInfo(MeshLodInformation* object);

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

@@ -7 +7 @@
 #include "infos/Bot.h"
 #include "worldentities/pawns/ModularSpaceShip.h"
+//#include "../modules/objects/collisionshapes/SphereCollisionShape.h"
+#include "graphics/Model.h"
+#include "worldentities/pawns/AAAAutonomousDrone.h"
+
 
 namespace orxonox
@@ -268 +272 @@
         }
 
-        //for (Level* level : ObjectList<Level>())
-        //    level->loadedNewXMLName(this);
-
-
-
-
-
-        /////!!!!!!!!!!!!!!!
-
-        this->controller_->level_->addObject(orxonox_cast<Pawn*>(entity));
-
-
+
+
+        ///////////////GOLD!!!!!!!!!!!!!!!////////////////////////
+        Pawn* pawn = this->controller_->getPawnByID(id);
+        //Attach to pawn
+        AAAAutonomousDrone* drone = new AAAAutonomousDrone(pawn->getContext()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something)
+        
+        drone->addTemplate("AAAAutonomousDroneTemplate"); //AAAAutonomousDroneTemplate spaceshipescort
+
+        Vector3 spawnPosition = pawn->getWorldPosition() + Vector3(30,0,-30);
+        drone->setPosition(spawnPosition);
+        //drone->moveFrontBack(1.0);
 
 
@@ -494 +498 @@
     {
         MobileEntity *entity = this->controller_->getMobileEntityByID(id);
+        
         if(entity == nullptr)
         {
@@ -499 +504 @@
             return;
         }
-
 
         Identifier *identifier = ClassByString("ControllableEntity");
@@ -505 +509 @@
         ControllableEntity *controllable_entity;
         
-
         if(identifier->isA(ClassIdentifier<ControllableEntity>::getIdentifier()))
         {
+            orxout(user_info) << "Before final cast..."<< endl;
             controllable_entity = orxonox_cast<ControllableEntity*>(entity);
+            orxout(user_info) << "After final cast..."<< endl;
             //ATTACHED COLLISION SHAPE is MANDATORY in order to move the entity
             controllable_entity->moveFrontBack(x);
             controllable_entity->moveRightLeft(y);
             controllable_entity->moveUpDown(z);
+            orxout(user_info) << "After move..."<< endl;
         }