- Timestamp:
- Oct 26, 2015, 5:44:31 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h
r10681 r10709 30 30 #define _DivisionController_H__ 31 31 32 #include "controllers/FleetController.h" 32 #include "controllers/LeaderController.h" 33 33 34 34 35 35 36 namespace orxonox 36 37 { 37 class _OrxonoxExport DivisionController : public FleetController38 class _OrxonoxExport DivisionController : public LeaderController 38 39 { 39 40 public: … … 48 49 inline FormationMode getFormationMode() const 49 50 { return this->formationMode_; } 51 virtual void setLeader(LeaderController* leader); 52 50 53 51 virtual void doFire();52 53 //WAYPOINT FUNCTIONS`54 void addWaypoint(WorldEntity* waypoint);55 WorldEntity* getWaypoint(unsigned int index) const;56 57 inline void setAccuracy(float accuracy)58 { this->squaredaccuracy_ = accuracy*accuracy; }59 inline float getAccuracy() const60 { return sqrt(this->squaredaccuracy_); }61 void updatePointsOfInterest(std::string name, float distance);62 void manageWaypoints();63 54 64 55 protected: … … 70 61 bool bHasTargetOrientation_; 71 62 Quaternion targetOrientation_; 72 void setTargetPosition(const Vector3& target); 63 FormationMode formationMode_; 64 65 /*void setTargetPosition(const Vector3& target); 73 66 void searchRandomTargetPosition(); 74 67 … … 78 71 virtual void positionReached() {} 79 72 80 static bool sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype); // hack81 73 82 74 … … 109 101 void spinInit(); 110 102 void spin(); 111 void turn180(); 103 void turn180();*/ 112 104 113 //WAYPOINT DATA 114 std::vector<WeakPtr<WorldEntity> > waypoints_; 115 size_t currentWaypoint_; 116 float squaredaccuracy_; 117 WorldEntity* defaultWaypoint_; 105 LeaderController* leader_; 106 107 118 108 119 109 private:
Note: See TracChangeset
for help on using the changeset viewer.