Changeset 10847 for code/branches/campaignHS15/src/orxonox/controllers/CommonController.h

Timestamp:

Nov 24, 2015, 11:54:47 AM (9 years ago)

Author:

gania

Message:

I hope that you don't code today, that version is not compilable just yet

File:

• code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) (9 diffs)

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

@@ -39 +39 @@
 #include "tools/interfaces/Tickable.h"
 #include <limits>
-
+#include "worldentities/Actionpoint.h"
 
 namespace orxonox
@@ -63 +63 @@
         enum Value
         {
-            FLY, FIGHT, PROTECT
+            NONE, FLY, FIGHT, PROTECT, FIGHTALL, ATTACK
         };
     }
@@ -111 +111 @@
                     ControllableEntity* getProtect ();
                 //----[/Protect data]----
+                //----[Actionpoint data]----
+                    void addActionpoint(WorldEntity* waypoint);
+                    WorldEntity* getActionpoint(unsigned int index) const;
+                //----[/Actionpoint data]----
             //----[/XML data]----
 
@@ -134 +138 @@
                 static bool sameTeam (ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gt);
                 static bool isLooking( ControllableEntity* entityThatLooks, ControllableEntity* entityBeingLookedAt, float angle ) ;
+                static std::string getName( ControllableEntity* entity ) ;
 
                 float squaredDistanceToTarget() const;
@@ -166 +171 @@
                 void doFire();
                 void setClosestTarget();
+                ControllableEntity* closestTarget();
 
                 bool bShooting_;
@@ -177 +183 @@
                 Quaternion targetOrientation_;
                 
-                Vector3 destination_;
-                bool bHasDestination;
+               
             //----[/where-to-fly information]----
             //----[protect information]----
@@ -185 +190 @@
             //----[who-to-kill information]----
                 WeakPtr<ControllableEntity> target_;
-                WeakPtr<ControllableEntity> enemy_;
-
+               
                 bool bHasPositionOfTarget_;
                 Vector3 positionOfTarget_;
@@ -193 +197 @@
             //----[/who-to-kill information]----
 
+            //----[Actionpoint information]----
+                std::vector<WeakPtr<WorldEntity> > actionpoints_;
+                float squaredaccuracy_;
+                <tuple<Action::Value ,std::string ,Vector3 > > currentActionpoint_;
+                std::vector<tuple<Action::Value ,std::string ,Vector3 > > parsedActionpoints_;
+            //----[/Actionpoint information]----
             //----["Private" variables]----
                 FormationMode::Value formationMode_;
@@ -198 +208 @@
                 std::string protectName_;
                 Action::Value action_;
+                int attackRange_;
+                
             //----[/"Private" variables]----               
     };