Changeset 991 for code/branches/hud2/src/orxonox/Orxonox.cc

Timestamp:

Apr 4, 2008, 12:10:58 PM (17 years ago)

Author:

rgrieder

Message:

• added the hud files and edited the CMLs

File:

• code/branches/hud2/src/orxonox/Orxonox.cc (modified) (3 diffs)

code/branches/hud2/src/orxonox/Orxonox.cc

@@ -255 +255 @@
     bulletMgr_ = new BulletManager();
     
-    Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
-    HUD* orxonoxHud;
-    orxonoxHud = new HUD();
-    orxonoxHud->setEnergyValue(20);
-    orxonoxHud->setEnergyDistr(20,20,60);
-    hudOverlay->show();
+    //Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
+    //HUD* orxonoxHud;
+    orxonoxHUD_ = new HUD(1);
+    //orxonoxHud->setEnergyValue(20);
+    //orxonoxHud->setEnergyDistr(20,20,60);
+    //hudOverlay->show();
     
     client_g->establishConnection();
@@ -306 +306 @@
     Loader::open(startlevel);
 
-    Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
-    orxonoxHUD_ = new HUD();
-    orxonoxHUD_->setEnergyValue(20);
-    orxonoxHUD_->setEnergyDistr(20,20,60);
-    hudOverlay->show();
+    //Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
+    orxonoxHUD_ = new HUD(1);
+    //orxonoxHUD_->setEnergyValue(20);
+    //orxonoxHUD_->setEnergyDistr(20,20,60);
+    //hudOverlay->show();
 
         /*
@@ -374 +374 @@
 
       // show the current time in the HUD
-      orxonoxHUD_->setTime((int)now, 0);
+      //orxonoxHUD_->setTime((int)now, 0);
+      orxonoxHUD_->energyCounter->reset(20);
+
 
       // Iterate through all Tickables and call their tick(dt) function