Changeset 1362 for code/trunk/src/orxonox/Orxonox.cc

Timestamp:

May 22, 2008, 2:56:48 PM (16 years ago)

Author:

scheusso

Message:

merged hud3 branch into trunk and changed camera orientation

File:

• code/trunk/src/orxonox/Orxonox.cc (modified) (2 diffs)

code/trunk/src/orxonox/Orxonox.cc

@@ -348 +348 @@
     // Load the HUD
     COUT(3) << "Orxonox: Loading HUD..." << std::endl;
-    Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
-    orxonoxHUD_ = new HUD();
-    orxonoxHUD_->setEnergyValue(20);
-    orxonoxHUD_->setEnergyDistr(20,20,60);
-    hudOverlay->show();
+    orxonoxHUD_ = new HUD(1);
 
     COUT(3) << "Orxonox: Loading Console..." << std::endl;
@@ -488 +484 @@
 
       // show the current time in the HUD
-      orxonoxHUD_->setTime((int)now, 0);
-      orxonoxHUD_->setRocket2(ogreRoot.getCurrentFrameNumber());
+//      orxonoxHUD_->setTime((int)now, 0);
+//      orxonoxHUD_->setRocket2(ogreRoot.getCurrentFrameNumber());
       if (eventTimes[3].back() - eventTimes[3].front() != 0)
-        orxonoxHUD_->setRocket1((int)(50000.0f/(eventTimes[3].back() - eventTimes[3].front())));
+//        orxonoxHUD_->setRocket1((int)(50000.0f/(eventTimes[3].back() - eventTimes[3].front())));
 
       // Iterate through all Tickables and call their tick(dt) function