Changeset 11906

Timestamp:

Apr 26, 2018, 2:45:47 PM (6 years ago)

Author:

adamc

Message:

scriptablecontroller can move and kill pawn

Location:

code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns

Files:

• CMakeLists.txt (modified) (1 diff)
• SpaceShip.cc (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)

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

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

code/branches/ScriptableController_FS18/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/ScriptableController_FS18/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -117 +117 @@
                 { this->steering_.y += 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.