Changeset 12101 for code/branches/WorldMap_HS18/src/orxonox

Timestamp:

Nov 14, 2018, 10:01:05 AM (6 years ago)

Author:

linggj

Message:

12

Location:

code/branches/WorldMap_HS18/src/orxonox/controllers

Files:

• StoryModeController.cc (modified) (2 diffs)
• StoryModeController.h (modified) (2 diffs)

code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc

@@ -36 +36 @@
     RegisterClass(StoryModeController);
 
-   StoryModeController::StoryModeController(Context* context) : ArtificialController(context)
+   StoryModeController::StoryModeController(Context* context) : Pawn(context)
     {
         RegisterObject(StoryModeController);
-        this->setAccuracy(100);
+        moveRight_ = false;
+        moveLeft_ = false;
+        //this->setAccuracy(50);
     }
 
     StoryModeController::~StoryModeController()
     {
-        for (WorldEntity* waypoint : this->waypoints_)
+        /*for (WorldEntity* waypoint : this->waypoints_)
         {
             if(waypoint)
                 waypoint->destroy();
-        }
+        }*/
+
     }
 
     void StoryModeController::tick(float dt)
     {
-        if (!this->isActive())
+        orxout(internal_error) << "Hi" << endl;
+        
+        /*if (!this->isActive())
             return;
 
@@ -59 +64 @@
             return;
 
-        if (false /* this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_*/)
-            this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
+        if (false /* this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_*///)
+            //this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
 
         //this->moveToPosition(this->waypoints_[this->currentWaypoint_]->getWorldPosition());
     }
 
+    void StoryModeController::moveFrontBack(const Vector2& value)
+    {
+        orxout(internal_error) << "FrontBack" << endl;
+
+            
+    }
+    void StoryModeController::moveRightLeft(const Vector2& value)
+    {
+        orxout(internal_error) << "RightLeft" << endl; 
+        if (value.x>0){
+            moveRight_ =false;
+            moveLeft_ =true;
+
+        } 
+
+    }
+
+    void StoryModeController::rotateYaw(const Vector2& value){}
+    void StoryModeController::rotatePitch(const Vector2& value){}
+    void StoryModeController::rotateRoll(const Vector2& value){}
+    void StoryModeController::fire(unsigned int a){}
+    void StoryModeController::fired(unsigned int b){}
+    void StoryModeController::boost(bool bBoost){}
 }

code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h

@@ -34 +34 @@
 #include <vector>
 #include "tools/interfaces/Tickable.h"
-#include "ArtificialController.h"
+#include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/SpaceShip.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport StoryModeController : public ArtificialController, public Tickable
+    class _OrxonoxExport StoryModeController : public Pawn
     {
         public:
@@ -44 +45 @@
             virtual ~StoryModeController();
 
-            virtual void tick(float dt) override;
-
+            virtual void tick(float dt) override;            
+            virtual void moveFrontBack(const Vector2& value) override;
+            virtual void moveRightLeft(const Vector2& value) override;
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
+            void fire(unsigned int firemode);
+            virtual void fired(unsigned int firemode) override;
+            virtual void boost(bool bBoost) override;
+            bool moveRight_ ;
+            bool moveLeft_ ;
         protected: