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

Timestamp:

May 24, 2008, 1:49:54 PM (16 years ago)

Author:

rgrieder

Message:

• reverted the HUD changes to ease up back merge from network branch

@everyone: please commit to the network branch from now on if it concerns the presentation.
Oli has also created a folder for the presentation files.
@fabian: you are excluded

File:

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

code/trunk/src/orxonox/Orxonox.cc

@@ -180 +180 @@
   {
     // keep in mind: the order of deletion is very important!
-//    if (this->orxonoxHUD_)
-//      delete this->orxonoxHUD_;
+    if (this->orxonoxHUD_)
+      delete this->orxonoxHUD_;
     Loader::close();
     InputManager::destroy();
@@ -348 +348 @@
     // Load the HUD
     COUT(3) << "Orxonox: Loading HUD..." << std::endl;
-    orxonoxHUD_ = &HUD::getSingleton();
+    orxonoxHUD_ = new HUD(1);
 
     COUT(3) << "Orxonox: Loading Console..." << std::endl;
@@ -487 +487 @@
 //      orxonoxHUD_->setRocket2(ogreRoot.getCurrentFrameNumber());
       if (eventTimes[3].back() - eventTimes[3].front() != 0)
-        HUD::setFPS(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