Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 8, 2008, 11:34:55 PM (17 years ago)
Author:
landauf
Message:
  • BarOverlayElement interpolates between given colours
  • Tried to fix a bug when releasing navigation focus
File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/hud/HUD.cc

    r1567 r1568  
    6666        radar_ = 0;
    6767        nav_ = 0;
    68         bool showFPS_ = true;
    69         bool showRenderTime_ = true;
     68        showFPS_ = true;
     69        showRenderTime_ = true;
    7070    }
    7171
     
    8484        Ogre::OverlayManager::getSingleton().addOverlayElementFactory(&radarOverlayElementFactory_);
    8585
    86         orxonoxHUD_ = Ogre::OverlayManager::getSingleton().create("Orxonox/HUD");
    87         container_ = static_cast<Ogre::OverlayContainer*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "Orxonox/HUD/container"));
    88 
    8986        // creating text to display fps
    9087        fpsText_ = static_cast<TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("TextArea", "fpsText"));
    91         fpsText_->show();
    9288        fpsText_->setMetricsMode(Ogre::GMM_PIXELS);
    9389        fpsText_->setDimensions(0.001, 0.001);
     
    9692        fpsText_->setCharHeight(20);
    9793        fpsText_->setCaption("init");
     94        fpsText_->show();
    9895
    9996        // creating text to display render time ratio
    10097        rTRText_ = static_cast<TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("TextArea", "rTRText"));
    101         rTRText_->show();
    10298        rTRText_->setMetricsMode(Ogre::GMM_PIXELS);
    10399        rTRText_->setDimensions(0.001, 0.001);
     
    106102        rTRText_->setCharHeight(20);
    107103        rTRText_->setCaption("init");
    108 
    109         // create energy bar
    110         energyBar_ = static_cast<BarOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Bar", "energyBar"));
    111         energyBar_->show();
    112         // create speedo bar
    113         speedoBar_ = static_cast<BarOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Bar", "speedoBar"));
    114         speedoBar_->show();
    115         // create radar
    116         radar_ = static_cast<RadarOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Radar", "radar"));
    117         radar_->show();
    118 
    119         // create Navigation
    120         nav_ = new Navigation(container_);
     104        rTRText_->show();
    121105
    122106        // set up screen-wide container
    123         container_->show();
    124 
    125         orxonoxHUD_->add2D(container_);
    126         orxonoxHUD_->show();
     107        container_ = static_cast<Ogre::OverlayContainer*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "Orxonox/HUD/container"));
    127108        container_->setLeft(0.0);
    128109        container_->setTop(0.0);
     
    132113        container_->addChild(fpsText_);
    133114        container_->addChild(rTRText_);
    134 
     115        container_->show();
     116
     117        orxonoxHUD_ = Ogre::OverlayManager::getSingleton().create("Orxonox/HUD");
     118        orxonoxHUD_->add2D(container_);
     119        orxonoxHUD_->show();
     120
     121        // create energy bar
     122        energyBar_ = static_cast<BarOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Bar", "energyBar"));
    135123        energyBar_->init(0.01, 0.94, 0.4, container_);
    136124        energyBar_->setValue(1);
    137 
     125        energyBar_->show();
     126
     127        // create speedo bar
     128        speedoBar_ = static_cast<BarOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Bar", "speedoBar"));
    138129        speedoBar_->init(0.01, 0.90, 0.4, container_);
    139 
     130        speedoBar_->addColour(0.7, ColourValue(0.2, 0.7, 0.2));
     131        speedoBar_->addColour(0.4, ColourValue(0.7, 0.5, 0.2));
     132        speedoBar_->addColour(0.1, ColourValue(0.7, 0.2, 0.2));
     133        speedoBar_->show();
     134
     135        // create radar
     136        radar_ = static_cast<RadarOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Radar", "radar"));
    140137        radar_->init(0.5, 0.9, 0.2, container_);
     138        radar_->show();
     139
     140        // create Navigation
     141        nav_ = new Navigation(container_);
    141142
    142143        WorldEntity* object;
     
    247248            {
    248249                if (this->nav_->getFocus() == (*it))
    249                     this->nav_->setFocus(0);
     250                    this->nav_->releaseFocus();
    250251
    251252                delete (*it);
     
    270271
    271272    /*static*/ void HUD::releaseNavigationFocus(){
    272         HUD::getSingleton().nav_->setFocus(0);
     273        HUD::getSingleton().nav_->releaseFocus();
    273274    }
    274275
Note: See TracChangeset for help on using the changeset viewer.