Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10843


Ignore:
Timestamp:
Nov 23, 2015, 9:08:28 PM (9 years ago)
Author:
gania
Message:

gani check in before a major change

Location:
code/branches/campaignHS15
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • code/branches/campaignHS15/data/levels/AITest.oxw

    r10840 r10843  
    6161      </controller>
    6262    </SpaceShip>
    63     <SpaceShip position="4000 ,1500, -1600 " lookat="0,0,0" team=0>
     63   <!-- <SpaceShip position="4000 ,1500, -1600 " lookat="0,0,0" team=0>
    6464      <templates>
    6565        <Template link=spaceshipassff />
    … …  
    9696        </SectionController>
    9797      </controller>
    98     </SpaceShip>
     98    </SpaceShip> -->
    9999   
    100100    <!-- <SpaceShip position="-4000, 1500, -5000" lookat="0,0,0">

  • code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc

    r10840 r10843  
    6969        //orxout(internal_error) << "I died, my Rank is " << rank_ << endl;
    7070    }
    71 
     71   
    7272    void CommonController::XMLPort( Element& xmlelement, XMLPort::Mode mode )
    7373    {
    … …  
    8585    void CommonController::tick(float dt)
    8686    {
    87 
     87        if (this->bHasTargetPosition_)
     88        {
     89            this->moveToTargetPosition(dt);
     90        }
     91        else if (this->bLookAtTarget_)
     92        {
     93            this->lookAtTarget(dt);
     94        }
     95        if (bShooting_)
     96        {
     97            this->doFire();
     98        }
     99        SUPER(CommonController, tick, dt);
    88100    }
    89101

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

    r10840 r10843  
    6868 
    6969
    70     class _OrxonoxExport CommonController : public Controller
     70    class _OrxonoxExport CommonController : public Controller, public Tickable
    7171    {
    7272

  • code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc

    r10840 r10843  
    6464    void DivisionController::tick(float dt)
    6565    {   
     66
    6667        if (!this->isActive())
    6768            return;
    68         if (this->bHasTargetPosition_)
    69         {
    70             this->moveToTargetPosition(dt);
    71         }
    72         else if (this->bLookAtTarget_)
    73         {
    74             this->lookAtTarget(dt);
    75         }
    76         if (bShooting_)
    77         {
    78             this->doFire();
    79         }
     69       
    8070       
    8171        SUPER(DivisionController, tick, dt);

  • code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h

    r10834 r10843  
    3636namespace orxonox
    3737{
    38     class _OrxonoxExport DivisionController : public LeaderController, public Tickable
    39       {
     38    class _OrxonoxExport DivisionController : public LeaderController
     39    {
    4040        public:
    4141            //----[language demanded functions]----           

  • code/branches/campaignHS15/src/orxonox/controllers/LeaderController.cc

    r10834 r10843  
    4343    }
    4444
    45    
     45        void LeaderController::tick(float dt)
     46        {
     47               
     48                SUPER(LeaderController, tick, dt);
     49        }
    4650    LeaderController::~LeaderController()
    4751    {

  • code/branches/campaignHS15/src/orxonox/controllers/LeaderController.h

    r10834 r10843  
    4545                virtual ~LeaderController();
    4646            //----[language demanded functions]----           
     47                virtual void tick(float dt);
    4748
    4849            //----[pseudo virtual methods]----

  • code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc

    r10840 r10843  
    6363    void SectionController::tick(float dt)
    6464    {
    65          if (!this->isActive())
     65        if (!this->isActive())
    6666            return;
    67         if (this->bHasTargetPosition_)
    68         {
    69             this->moveToTargetPosition(dt);
    70         }
    71         else if (this->bLookAtTarget_)
    72         {
    73             this->lookAtTarget(dt);
    74         }
    75         if (bShooting_)
    76         {
    77             this->doFire();
    78         }
     67     
    7968       
    8069        SUPER(SectionController, tick, dt);

  • code/branches/campaignHS15/src/orxonox/controllers/SectionController.h

    r10834 r10843  
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport SectionController : public LeaderController, public Tickable
     37    class _OrxonoxExport SectionController : public LeaderController
    3838    {
    3939        public:

  • code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc

    r10838 r10843  
    6161        if (!this->isActive())
    6262            return;
    63         if (this->bHasTargetPosition_)
    64         {
    65             this->moveToTargetPosition(dt);
    66         }
    67         else if (this->bLookAtTarget_)
    68         {
    69             this->lookAtTarget(dt);
    70         }
    71         if (bShooting_)
    72         {
    73             this->doFire();
    74         }
     63       
    7564       
    7665        SUPER(WingmanController, tick, dt);

  • code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h

    r10834 r10843  
    3636namespace orxonox
    3737{
    38     class _OrxonoxExport WingmanController : public CommonController, public Tickable
     38    class _OrxonoxExport WingmanController : public CommonController
    3939    {
    4040        public:

  • code/branches/campaignHS15/src/orxonox/worldentities/CMakeLists.txt

    r8706 r10843  
    1212  SpawnPoint.cc
    1313  TeamSpawnPoint.cc
     14  ActionPoint.cc
    1415)
    1516
Note: See TracChangeset for help on using the changeset viewer.