Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 20, 2007, 4:10:08 PM (16 years ago)
Author:
nicolasc
Message:
  • a lot of inlining of getfunctions
  • set libaudio to shared (not sure, if related: audioplayer + ingame sound == crash!)
  • minor space cleanups
File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN/src/orxonox/hud/HUD.h

    r618 r659  
    1919  private:
    2020
    21     Ogre::OverlayElement* timeText_;
    22         Ogre::OverlayElement* targetWindowNameText_;
    23         Ogre::OverlayElement* targetWindowStatusText_;
    24         Ogre::OverlayElement* targetWindowDistanceText_;
    25         Ogre::OverlayElement* targetWindowHitRatingText_;
    26         Ogre::OverlayElement* energyLength_;
    27         Ogre::OverlayElement* shieldLeftTop_;
    28         Ogre::OverlayElement* shieldRightTop_;
    29         Ogre::OverlayElement* shieldLeftBottom_;
    30         Ogre::OverlayElement* shieldRightBottom_;
    31         Ogre::OverlayElement* rocketNum1_;
    32         Ogre::OverlayElement* rocketNum2_;
    33         Ogre::OverlayElement* rocketNum3_;
    34         Ogre::OverlayElement* rocketNum4_;
    35         Ogre::OverlayElement* energyDistrPoint_;
    36         Ogre::OverlayElement* primarChoice_;
     21  Ogre::OverlayElement* timeText_;
     22  Ogre::OverlayElement* targetWindowNameText_;
     23  Ogre::OverlayElement* targetWindowStatusText_;
     24  Ogre::OverlayElement* targetWindowDistanceText_;
     25  Ogre::OverlayElement* targetWindowHitRatingText_;
     26  Ogre::OverlayElement* energyLength_;
     27  Ogre::OverlayElement* shieldLeftTop_;
     28  Ogre::OverlayElement* shieldRightTop_;
     29  Ogre::OverlayElement* shieldLeftBottom_;
     30  Ogre::OverlayElement* shieldRightBottom_;
     31  Ogre::OverlayElement* rocketNum1_;
     32  Ogre::OverlayElement* rocketNum2_;
     33  Ogre::OverlayElement* rocketNum3_;
     34  Ogre::OverlayElement* rocketNum4_;
     35  Ogre::OverlayElement* energyDistrPoint_;
     36  Ogre::OverlayElement* primarChoice_;
    3737
     38  int timeMin_;
     39  int timeSec_;
    3840
     41  Ogre::String targetWindowName_;
     42  Ogre::String targetWindowStatus_;
     43  int targetWindowDistance_;
     44  int targetWindowHitRating_;
    3945
     46  int energyValue_;
    4047
     48  bool shieldLeftTopValue_;
     49  bool shieldRightTopValue_;
     50  bool shieldLeftBottomValue_;
     51  bool shieldRightBottomValue_;
    4152
    42         int timeMin_;
    43         int timeSec_;
     53  int rocket1_;
     54  int rocket2_;
     55  int rocket3_;
     56  int rocket4_;
    4457
    45         Ogre::String targetWindowName_;
    46         Ogre::String targetWindowStatus_;
    47         int targetWindowDistance_;
    48         int targetWindowHitRating_;
     58  float energyDistrShield_;
     59  float energyDistrEngine_;
     60  float energyDistrLaser_;
    4961
    50         int energyValue_;
     62  float energyDistrPixelX_;
     63  float energyDistrPixelY_;
    5164
    52         bool shieldLeftTopValue_;
    53         bool shieldRightTopValue_;
    54         bool shieldLeftBottomValue_;
    55         bool shieldRightBottomValue_;
     65  int primarValue_;
    5666
    57         int rocket1_;
    58         int rocket2_;
    59         int rocket3_;
    60         int rocket4_;
     67  public:
     68  HUD( void );
     69  ~HUD( void );
     70  void init( void );
    6171
    62         double energyDistrShield_;
    63         double energyDistrEngine_;
    64         double energyDistrLaser_;
    65 
    66         double energyDistrPixelX_;
    67         double energyDistrPixelY_;
    68 
    69         int primarValue_;
    70 
    71 
    72 
    73 
    74 
    75 
    76  public:
    77         HUD( void );
    78         ~HUD( void );
    79         void init( void );
    80 
    81         void setTime(int i, int j);
    82         void setTargetWindowName(Ogre::String i);
    83         void setTargetWindowStatus(Ogre::String i);
    84         void setTargetWindowDistance(int i);
    85         void setTargetWindowHitRating(int i);
    86         void setEnergyValue(int i);
    87         void setShieldLeftTopValue(bool i);
    88         void setShieldRightTopValue(bool i);
    89         void setShieldLeftBottomValue(bool i);
    90         void setShieldRightBottomValue(bool i);
    91         void setRocket1(int i);
    92         void setRocket2(int i);
    93         void setRocket3(int i);
    94         void setRocket4(int i);
    95         void setEnergyDistr(double s, double e, double l);
    96         void setPrimar(int i);
    97 
    98 
    99 
    100 
    101 
     72  void setTime(int i, int j);
     73  void setTargetWindowName(Ogre::String i);
     74  void setTargetWindowStatus(Ogre::String i);
     75  void setTargetWindowDistance(int i);
     76  void setTargetWindowHitRating(int i);
     77  void setEnergyValue(int i);
     78  void setShieldLeftTopValue(bool i);
     79  void setShieldRightTopValue(bool i);
     80  void setShieldLeftBottomValue(bool i);
     81  void setShieldRightBottomValue(bool i);
     82  void setRocket1(int i);
     83  void setRocket2(int i);
     84  void setRocket3(int i);
     85  void setRocket4(int i);
     86  void setEnergyDistr(float s, float e, float l);
     87  void setPrimar(int i);
    10288
    10389};
    10490
    105 
    10691}
    10792#endif
Note: See TracChangeset for help on using the changeset viewer.