Changeset 12016 for code/branches/PresentationFS18/src/orxonox/worldentities/pawns

Timestamp:

May 30, 2018, 2:37:02 PM (7 years ago)

Author:

patricwi

Message:

Merged Scriptable Controller

Location:

code/branches/PresentationFS18

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (6 diffs)
• src/orxonox/worldentities/pawns/ScriptableControllerDrone.cc (copied) (copied from code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.cc)
• src/orxonox/worldentities/pawns/ScriptableControllerDrone.h (copied) (copied from code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.h)
• src/orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/SpaceShip.h (modified) (1 diff)

code/branches/PresentationFS18/src/orxonox/worldentities/pawns/CMakeLists.txt

@@ -4 +4 @@
   Pawn.cc
   SpaceShip.cc
+  ScriptableControllerDrone.cc
   ModularSpaceShip.cc
   TeamBaseMatchBase.cc

code/branches/PresentationFS18/src/orxonox/worldentities/pawns/Pawn.cc

@@ -50 +50 @@
 #include "sound/WorldSound.h"
 #include "core/object/ObjectListIterator.h"
+#include "Level.h"
+#include "scriptablecontroller/scriptable_controller.h"
 
 #include "controllers/FormationController.h"
@@ -160 +162 @@
 
         XMLPortParam ( RadarViewable, "radarname", setRadarName, getRadarName, xmlelement, mode );
+
+        if(!this->id_.empty() && this->getLevel() != nullptr)
+            this->getLevel()->getScriptableController()->registerPawn(this->id_, this);
     }
 
@@ -282 +287 @@
         {
             // Health-damage cannot be absorbed by shields.
-            // Shield-damage only reduces shield health. 
+            // Shield-damage only reduces shield health.
             // Normal damage can be (partially) absorbed by shields.
 
@@ -302 +307 @@
                 this->setHealth(this->health_ - (damage - shielddamage) - healthdamage);
             }
+            this->getLevel()->getScriptableController()->pawnHit(this, originator, this->health_, this->shieldHealth_);
 
             this->lastHitOriginator_ = originator;
@@ -402 +408 @@
             }
         }
+
+        this->getLevel()->getScriptableController()->pawnKilled(this);
     }
     void Pawn::goWithStyle()
@@ -625 +633 @@
         {
             // delete all debug models
-            for(Model* model : debugWeaponSlotModels_) 
+            for(Model* model : debugWeaponSlotModels_)
             {
                 model->destroy();

code/branches/PresentationFS18/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -163 +163 @@
             engine->run(dt);
 
-        if (this->hasLocalController())
+        if (this->hasLocalController() || true)
         {
             // If not in mouse look apply the angular movement to the ship.

code/branches/PresentationFS18/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -117 +117 @@
                 { this->steering_.y += (0.6)*value.x; }
 
+            inline void moveFrontBack(float value)
+                { this->moveFrontBack(Vector2(value, 0)); }
+            inline void moveRightLeft(float value)
+                { this->moveRightLeft(Vector2(value, 0)); }
+            inline void moveUpDown(float value)
+                { this->moveUpDown(Vector2(value, 0)); }    
+
             virtual void rotateYaw(const Vector2& value); // Rotate in yaw direction.
             virtual void rotatePitch(const Vector2& value); // Rotate in pitch direction.