Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 17, 2016, 1:59:00 PM (9 years ago)
Author:
landauf
Message:

added c++11 features to code that was added in presentationHS15

Location:
code/branches/cpp11_v3/src/modules/overlays/hud
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.cc

    r11052 r11065  
    4141
    4242        this->setConfigValues();
    43         this->owner_ = NULL;
     43        this->owner_ = nullptr;
    4444    }
    4545
    … …  
    6262    void HUDEnemyShieldBar::updateTarget()
    6363    {
    64         Pawn* pawn = NULL;
     64        Pawn* pawn = nullptr;
    6565        if (this->owner_ && this->useEnemyBar_)
    6666        {
    … …  
    7373            // Don't show the EnemyShieldBar if the pawn is invisible
    7474            if (pawn && !pawn->isVisible())
    75                 pawn = NULL;
     75                pawn = nullptr;
    7676        }
    7777        // Set the pawn as owner of the EnemyShieldBar
    7878        this->setShieldBarOwner(pawn);
    79         this->setVisible(pawn != NULL);
     79        this->setVisible(pawn != nullptr);
    8080    }
    8181

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDEnemyShieldBar.h

    r11052 r11065  
    4545
    4646            void setConfigValues();
    47             virtual void tick(float dt);
     47            virtual void tick(float dt) override;
    4848
    49             void changedOwner();
     49            virtual void changedOwner() override;
    5050
    5151        private:

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.cc

    r11052 r11065  
    4040        RegisterObject(HUDRocketFuelBar);
    4141
    42         this->owner_ = NULL;
     42        this->owner_ = nullptr;
    4343    }
    4444

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDRocketFuelBar.h

    r11052 r11065  
    4949        virtual ~HUDRocketFuelBar();
    5050
    51         virtual void tick(float dt);
    52         virtual void changedOwner();
     51        virtual void tick(float dt) override;
     52        virtual void changedOwner() override;
    5353
    5454    private:

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.cc

    r11052 r11065  
    4141        RegisterObject(HUDShieldBar);
    4242
    43         this->owner_ = NULL;
     43        this->owner_ = nullptr;
    4444    }
    4545

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDShieldBar.h

    r11052 r11065  
    4949        virtual ~HUDShieldBar();
    5050
    51         virtual void tick(float dt);
    52         virtual void changedOwner();
     51        virtual void tick(float dt) override;
     52        virtual void changedOwner() override;
    5353
    5454        inline void setShieldBarOwner(Pawn* owner)

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.cc

    r11059 r11065  
    7676        if (!weapon_)
    7777        {
    78             // TODO: destroy this HUD id the Weapon does no more exist. (Wehen the weak pointer is NULL)
     78            // TODO: destroy this HUD id the Weapon does no more exist. (Wehen the weak pointer is null)
    7979        }
    8080    }   
    … …  
    114114        bool visible = this->isVisible();
    115115
    116         for (std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)
    117         {
    118             (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
    119             (*it)->setVisible(visible);
     116        for (HUDWeaponMode* hudWeaponMode : hudWeaponModes_)
     117        {
     118            hudWeaponMode->changedVisibility(); //inform all Child Overlays that our visibility has changed
     119            hudWeaponMode->setVisible(visible);
    120120        }
    121121    }
    … …  
    154154    void HUDWeapon::createHUDChilds()
    155155    {
    156         if (weapon_ == NULL)
     156        if (weapon_ == nullptr)
    157157        {
    158158            return;
    … …  
    161161        int positionIndex = 0;
    162162
    163         for (std::multimap<unsigned int, WeaponMode*>::const_iterator it = weapon_->getAllWeaponmodes().begin(); it != weapon_->getAllWeaponmodes().end(); ++it)
     163        for (const auto& mapEntry : weapon_->getAllWeaponmodes())
    164164        {
    165165            HUDWeaponMode* hudWeaponMode = new HUDWeaponMode(this->getContext());
    … …  
    167167            hudWeaponMode->setOverlayGroup(this->getOverlayGroup());
    168168            hudWeaponMode->setVisible(this->isVisible());
    169             hudWeaponMode->setWeaponMode(it->second);
     169            hudWeaponMode->setWeaponMode(mapEntry.second);
    170170            hudWeaponMode->setWeaponIndex(this->weaponIndex_);                   
    171171            hudWeaponMode->setAspectCorrection(false);
    … …  
    182182        int positionIndex = 0;
    183183
    184         for (std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)
    185         {
    186             (*it)->setPositionOffset(this->positionOffset_);
    187             (*it)->setWeaponModeIndex(positionIndex);
    188             (*it)->setWeaponIndex(this->weaponIndex_);
    189             (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
     184        for (HUDWeaponMode* hudWeaponMode : hudWeaponModes_)
     185        {
     186            hudWeaponMode->setPositionOffset(this->positionOffset_);
     187            hudWeaponMode->setWeaponModeIndex(positionIndex);
     188            hudWeaponMode->setWeaponIndex(this->weaponIndex_);
     189            hudWeaponMode->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
    190190
    191191            ++ positionIndex;
    … …  
    195195    void HUDWeapon::destroyHUDChilds()
    196196    {
    197         for (std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)
    198         {
    199             (*it)->destroy();
     197        for (HUDWeaponMode* hudWeaponMode : hudWeaponModes_)
     198        {
     199            hudWeaponMode->destroy();
    200200        }
    201201
    … …  
    205205    void HUDWeapon::updateSize()
    206206    {
    207         if (weapon_ != NULL)
     207        if (weapon_ != nullptr)
    208208        {
    209209            this->setSize(Vector2(weaponModeHUDActualSize_.x,weaponModeHUDActualSize_.y*weapon_->getAllWeaponmodes().size()));
    … …  
    214214    void HUDWeapon::updatePosition()
    215215    {
    216         if (weapon_ != NULL)
     216        if (weapon_ != nullptr)
    217217        {
    218218            this->setPosition(Vector2(weaponModeHUDActualSize_.x*weaponIndex_,0.0f) + this->positionOffset_);

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h

    r11064 r11065  
    5555        virtual ~HUDWeapon();
    5656
    57         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    58         virtual void tick(float dt);
    59         virtual void changedOwner();
    60         virtual void changedOverlayGroup();
    61         virtual void changedVisibility();
    62         virtual void changedName();
    63         virtual void positionChanged();
    64         virtual void sizeChanged();
     57        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     58        virtual void tick(float dt) override;
     59        virtual void changedOwner() override;
     60        virtual void changedOverlayGroup() override;
     61        virtual void changedVisibility() override;
     62        virtual void changedName() override;
     63        virtual void positionChanged() override;
     64        virtual void sizeChanged() override;
    6565
    6666        void setWeapon(Weapon* weapon);
    … …  
    9494        WeakPtr<Weapon> weapon_;
    9595
    96         std::vector<WeakPtr<HUDWeaponMode> > hudWeaponModes_;
     96        std::vector<WeakPtr<HUDWeaponMode>> hudWeaponModes_;
    9797
    9898        Ogre::PanelOverlayElement* overlayElement_;

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc

    r11063 r11065  
    126126            Munition* munition = this->weaponMode_->getMunition();
    127127
    128             if (munition != NULL)
     128            if (munition != nullptr)
    129129            {
    130130                MunitionDeployment deployment = munition->getMunitionDeployment();
    … …  
    237237        Munition* munition = this->weaponMode_->getMunition();
    238238
    239         if (munition != NULL)
     239        if (munition != nullptr)
    240240        {
    241241            MunitionDeployment deployment = munition->getMunitionDeployment();

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h

    r11064 r11065  
    5757        virtual ~HUDWeaponMode();
    5858
    59         virtual void tick(float dt);
    60         virtual void changedOwner();
    61         virtual void changedOverlayGroup();
    62         virtual void changedVisibility();
    63         virtual void changedName();
    64         virtual void positionChanged();
    65         virtual void sizeChanged();
     59        virtual void tick(float dt) override;
     60        virtual void changedOwner() override;
     61        virtual void changedOverlayGroup() override;
     62        virtual void changedVisibility() override;
     63        virtual void changedName() override;
     64        virtual void positionChanged() override;
     65        virtual void sizeChanged() override;
    6666
    6767        void setWeaponMode(WeaponMode* weaponMode);

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.cc

    r11059 r11065  
    103103        bool visible = this->isVisible();
    104104
    105         for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
     105        for (HUDWeapon* hudWeapon : hudWeapons_)
    106106        {
    107             (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
    108             (*it)->setVisible(visible);
     107            hudWeapon->changedVisibility(); //inform all Child Overlays that our visibility has changed
     108            hudWeapon->setVisible(visible);
    109109        }
    110110    }
    … …  
    129129        {
    130130            const std::vector<WeaponPack*>& weaponPacks = owner_->getWeaponSystem()->getAllWeaponPacks();
    131 
    132             for (std::vector<WeaponPack*>::const_iterator itPacks = weaponPacks.begin(); itPacks != weaponPacks.end(); ++itPacks)
     131            for (WeaponPack* weaponPack : weaponPacks)
    133132            {
    134                 const std::vector<Weapon*>& weapons = (*itPacks)->getAllWeapons();
    135 
    136                 for (std::vector<Weapon*>::const_iterator itWeapons = weapons.begin(); itWeapons != weapons.end(); ++itWeapons)
     133                const std::vector<Weapon*>& weapons = weaponPack->getAllWeapons();
     134                for (Weapon* weapon : weapons)
    137135                {
    138                     this->weapons_.push_back(*itWeapons);
     136                    this->weapons_.push_back(weapon);
    139137                }
    140138            }
    … …  
    149147        int positionIndex = 0;
    150148
    151         for (std::vector<WeakPtr<Weapon> >::iterator it = weapons_.begin(); it != weapons_.end(); ++it)
     149        for (Weapon* weapon : weapons_)
    152150        {
    153151            HUDWeapon* hudWeapon = new HUDWeapon(this->getContext());
    … …  
    155153            hudWeapon->setOverlayGroup(this->getOverlayGroup());
    156154            hudWeapon->setVisible(this->isVisible());
    157             hudWeapon->setWeapon(*it);
     155            hudWeapon->setWeapon(weapon);
    158156            hudWeapon->setAspectCorrection(false);
    159157            hudWeapon->setPickPoint(Vector2(0.0f,0.0f));
    … …  
    170168        Vector2 offset = this->getPosition();
    171169
    172         for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
     170        for (HUDWeapon* hudWeapon : hudWeapons_)
    173171        {
    174             (*it)->setPositionOffset(offset);
    175             (*it)->setWeaponIndex(positionIndex);
    176             (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
     172            hudWeapon->setPositionOffset(offset);
     173            hudWeapon->setWeaponIndex(positionIndex);
     174            hudWeapon->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
    177175
    178176            ++ positionIndex;
    … …  
    182180    void HUDWeaponSystem::destroyHUDChilds()
    183181    {
    184         for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
     182        for (HUDWeapon* hudWeapon : hudWeapons_)
    185183        {
    186             (*it)->destroy();
     184            hudWeapon->destroy();
    187185        }
    188186

  • code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h

    r11064 r11065  
    4949        virtual ~HUDWeaponSystem();
    5050
    51         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    52         virtual void changedOwner();
    53         virtual void changedOverlayGroup();
    54         virtual void changedVisibility();
    55         virtual void changedName();
    56         virtual void positionChanged();
    57         virtual void sizeChanged();
     51        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     52        virtual void changedOwner() override;
     53        virtual void changedOverlayGroup() override;
     54        virtual void changedVisibility() override;
     55        virtual void changedName() override;
     56        virtual void positionChanged() override;
     57        virtual void sizeChanged() override;
    5858    protected:
    5959        inline void setWeaponModeHUDSize(Vector2 vector)
    … …  
    7171        WeakPtr<Pawn> owner_;
    7272
    73         std::vector<WeakPtr<Weapon> > weapons_;
    74         std::vector<WeakPtr<HUDWeapon> > hudWeapons_;
     73        std::vector<WeakPtr<Weapon>> weapons_;
     74        std::vector<WeakPtr<HUDWeapon>> hudWeapons_;
    7575
    7676        Vector2 weaponModeHUDSize_;
Note: See TracChangeset for help on using the changeset viewer.