Changeset 10789 for code/branches/AI_HS15/src/orxonox/controllers/CommonController.h

Timestamp:

Nov 9, 2015, 4:38:02 PM (9 years ago)

Author:

gania

Message:

did nothing today

File:

• code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) (4 diffs)

code/branches/AI_HS15/src/orxonox/controllers/CommonController.h

@@ -76 +76 @@
     }
 
+
     class _OrxonoxExport CommonController : public Controller
     {
@@ -121 +122 @@
         protected:
 
-            void moveToPosition(const Vector3& target);
-            void moveToTargetPosition();
+            void moveToPoint(const Vector3& relativeTargetPosition, float angleRoll);
+            bool moveAndRoll(float dt);
+
+            void moveToPosition(const Vector3& target, float dt);
+            void moveToTargetPosition(float dt);
             //enum Mode {ROCKET, ATTACK, MOVE, HOLD};//TODO; implement DEFENCE, MOVING modes
 
             //Mode mode_;
-            void copyOrientation(const Quaternion& orient);
-            void copyTargetOrientation();
+            void copyOrientation(const Quaternion& orient, float dt);
+            void copyTargetOrientation(float dt);
 
             float squaredDistanceToTarget() const;
@@ -160 +164 @@
             WeakPtr<ControllableEntity> objectiveTarget_;
 
-            float angleRolled_;
-            float angleRoll_;
 
 
@@ -169 +171 @@
             Maneuver::Value maneuver_;
 
-            ClassTreeMask               targetMask_;
-
+            bool executingManeuver_;
+            bool executingMoveToPoint_;
          
         private: