Changeset 10953 for code/branches/campaignHS15/src/orxonox/controllers/FightingController.h

Timestamp:

Dec 7, 2015, 8:42:03 PM (8 years ago)

Author:

gania

Message:

converted hack to a legal class

File:

• code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) (3 diffs)

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

@@ -55 +55 @@
                 { return this->target_; }
             bool bKeepFormation_;   //even if action_ == FIGHT, you might still want to keep formation if far enough form the target
-           
+            virtual void maneuver(); //<! sets this->targetPosition_, which is a Vector3 of where this ship flies. Decision is made based on
+                             //<! the distance to enemy, if being attacked, dodge() is called, otherwise ship just flies towards this->target_.
+            bool bShooting_;
+            bool canFire(); //<! check if target_ is in radius and if this is looking at target_
+
         protected:
             void setTarget(ControllableEntity* target); //set a target to shoot at
@@ -65 +69 @@
             void lookAtTarget(float dt);    //<! rotate yourself towards target
 
-            void maneuver(); //<! sets this->targetPosition_, which is a Vector3 of where this ship flies. Decision is made based on
-                             //<! the distance to enemy, if being attacked, dodge() is called, otherwise ship just flies towards this->target_.
             void dodge(const Vector3& thisPosition, float diffLength,  Vector3& diffUnit); //<! choose a random Vector3 perpendicular to the difference vector between
                                                                         //<! this and target_ plus or minus some amount in difference vector direction,
                                                                         //<! depending on whether it is better to close up or survive.
             void dodgeTowards (Vector3& position);  //fly towards position and awoid being hit
-            bool canFire(); //<! check if target_ is in radius and if this is looking at target_
             void doFire();  //<! choose weapon, set aim at target_ and fire
             WeakPtr<ControllableEntity> target_;
@@ -84 +85 @@
             bool bDodge_;
             int attackRange_;
-            bool bShooting_;
             bool bLookAtTarget_; 
             float deltaHp;