Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 22, 2015, 5:06:38 PM (9 years ago)
Author:
gania
Message:

some comments added

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r10805 r10826  
    3434#include "worldentities/ControllableEntity.h"
    3535#include "worldentities/pawns/Pawn.h"
    36 #include "core/ClassTreeMask.h"
     36#include <limits>
    3737
    3838
    … …  
    4444        enum Value
    4545        {
    46             VEE, FINGER4, DIAMOND, WALL
     46            FINGER4, DIAMOND, WALL
    4747        };
    4848    }
    … …  
    5555
    5656    }
    57     //none for a formation flight without attacking, neutral when opponent and this have no
    58     //advantage over each other, offensive when this spotted opponent first,
    59     //defensive otherwise
    60     namespace ManeuverType
    61     {
    62         enum Value
    63         {
    64             NONE, NEUTRAL, OFFENSIVE, DEFENCIVE
    65         };
    66 
    67     }
    6857    namespace Action
    6958    { 
    … …  
    7362        };
    7463    }
    75     //none for a formation flight
    76     namespace Maneuver
    77     {
    78         enum Value
    79         {
    80             NONE, GUNSD, SCISSORS, COMBATSPREAD, DEFENSIVESPLIT, BREAK, BARRELROLL, SWOOP, IMMELMANN,
    81             WINGOVER, LOWYOYO, HIGHYOYO, LAGDISPLACEMENTROLL
    82         };
    83     }
    84 
     64 
    8565
    8666    class _OrxonoxExport CommonController : public Controller
    … …  
    11898            virtual bool setWingman(CommonController* wingman);
    11999            virtual bool hasWingman();
    120 
     100            static bool sameTeam (ControllableEntity* entity1, ControllableEntity* entity2);
    121101            void setTarget(ControllableEntity* target);
    122102            bool hasTarget();
    … …  
    147127            void copyTargetOrientation(float dt);
    148128
     129            static float distance(ControllableEntity* entity1, ControllableEntity* entity2);
    149130            float squaredDistanceToTarget() const;
    150131            void doFire();
    … …  
    202183            FormationMode::Value formationMode_;
    203184            Rank::Value rank_;
    204             ManeuverType::Value maneuverType_;
    205             Maneuver::Value maneuver_;
    206 
    207             bool executingManeuver_;
     185       
    208186            bool executingMoveToPoint_;
    209187         
Note: See TracChangeset for help on using the changeset viewer.