Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 22, 2008, 12:06:55 AM (16 years ago)
Author:
rgrieder
Message:
  • added blankString to String so you can return ""; even if it's a const std::string&
  • fixed several bugs with aspect correct and margin alignment
  • added console commands for OrxonoxOverlays and OverlayGroups for rotate, scale and scroll (you can access the by name (from name=.. in xml file), e.g. "OrxonoxOverlay rotateOverlay SpeedBar 90)
  • converted everything in overlays/ to 4 spaces/tab ;)
  • removed all using namespace Ogre;
  • added background_ Panel to OrxonoxOverlay, since most of the derived classes can use that
  • should work now, but I'll have to test on a tardis box first
File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/hud/src/orxonox/overlays/hud/HUDFPSText.cc

    r1614 r1615  
    3535namespace orxonox
    3636{
    37   CreateFactory(HUDFPSText);
     37    CreateFactory(HUDFPSText);
    3838
    39   HUDFPSText::HUDFPSText()
    40   {
    41     RegisterObject(HUDFPSText);
    42   }
     39    HUDFPSText::HUDFPSText()
     40    {
     41        RegisterObject(HUDFPSText);
     42    }
    4343
    44   HUDFPSText::~HUDFPSText()
    45   {
    46     if (this->isInitialized())
     44    HUDFPSText::~HUDFPSText()
    4745    {
    4846    }
    49   }
    5047
    51   void HUDFPSText::tick(float dt)
    52   {
    53     float fps = GraphicsEngine::getSingleton().getAverageFPS();
    54     this->text_->setCaption(this->getCaption() + convertToString(fps));
    55   }
     48    void HUDFPSText::tick(float dt)
     49    {
     50        float fps = GraphicsEngine::getSingleton().getAverageFPS();
     51        this->text_->setCaption(this->getCaption() + convertToString(fps));
     52    }
    5653}
Note: See TracChangeset for help on using the changeset viewer.