Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6306 in orxonox.OLD for trunk/src/world_entities/weapons


Ignore:
Timestamp:
Dec 26, 2005, 2:27:13 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: cool bars for the rocket-louncher

Location:
trunk/src/world_entities/weapons
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/weapons/turret.cc

    r6222 r6306  
    8282
    8383  this->setStateDuration(WS_SHOOTING, .1);
    84   this->setStateDuration(WS_RELOADING, .1);
     84  this->setStateDuration(WS_RELOADING, 1.0f);
    8585  this->setStateDuration(WS_ACTIVATING, .4);
    8686  this->setStateDuration(WS_DEACTIVATING, .4);
    8787
    88   this->setMaximumEnergy(10000, 50);
    89   this->increaseEnergy(100000);
     88  this->setMaximumEnergy(100, 5);
     89  this->increaseEnergy(100);
    9090  //this->minCharge = 2;
    9191
     
    9696  this->setEmissionPoint(1.684, 0.472, 0);
    9797  //this->getProjectileFactory()->prepare(100);
     98
     99  this->bar = new GLGuiBar;
     100  this->bar->setSize2D( 20, 100);
     101  this->bar->setMaximum(this->getEnergyMax());
     102  this->bar->setValue(this->getEnergy());
     103  this->loadedBar = new GLGuiBar;
     104  this->loadedBar->setParent2D(this->bar);
     105  this->loadedBar->setRelCoor2D(20,0);
     106  this->loadedBar->setSize2D(10,50);
     107  this->loadedBar->setMaximum(this->getLoadedEnergyMax());
    98108}
    99109
     
    106116void Turret::activate()
    107117{
     118  this->bar->show();
     119  this->loadedBar->show();
    108120}
    109121
    110122void Turret::deactivate()
    111123{
     124  this->bar->hide();
     125  this->loadedBar->hide();
    112126}
    113127
     
    141155  pj->setAbsDir(this->getAbsDir());
    142156  pj->activate();
     157
     158  this->bar->setValue( this->getEnergy());
     159  this->loadedBar->setValue(this->getLoadedEnergy());
    143160}
    144161
  • trunk/src/world_entities/weapons/turret.h

    r5994 r6306  
    88
    99#include "weapon.h"
     10
     11#include "glgui_bar.h"
    1012
    1113class Turret : public Weapon
     
    2830
    2931  private:
     32    GLGuiBar*    bar;
     33    GLGuiBar*    loadedBar;
    3034  };
    3135
  • trunk/src/world_entities/weapons/weapon.cc

    r6142 r6306  
    438438      this->soundSource->play(this->soundBuffers[WA_SHOOT]);
    439439          // fire
     440    this->energyLoaded -= this->minCharge;
    440441    this->fire();
    441     this->energyLoaded -= this->minCharge;
    442442          // setting up for the next state
    443443    this->enterState(WS_SHOOTING);
  • trunk/src/world_entities/weapons/weapon.h

    r6054 r6306  
    136136    /** @param energyMax the maximum energy the Weapon can have @param energyLoadedMax the maximum energy in the weapon buffers */
    137137    inline void setMaximumEnergy(float energyMax, float energyLoadedMax) { this->energyMax = energyMax; this->energyLoadedMax = energyLoadedMax; };
     138    inline float getLoadedEnergyMax() const { return this->energyLoadedMax; };
     139    inline float getEnergyMax() const { return this->energyMax; };
     140    inline float getEnergy() const { return this->energy; };
     141    inline float getLoadedEnergy() const { return this->energyLoaded; };
    138142
    139143    void setActionSound(WeaponAction action, const char* soundFile);
Note: See TracChangeset for help on using the changeset viewer.