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

Timestamp:

May 22, 2008, 5:22:33 PM (16 years ago)

Author:

FelixSchulthess

Message:

made HUD singleton

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_ = new HUD(1);
+    orxonoxHUD_ = &HUD::getSingleton();
 
     COUT(3) << "Orxonox: Loading Console..." << std::endl;
@@ -487 +487 @@
 //      orxonoxHUD_->setRocket2(ogreRoot.getCurrentFrameNumber());
       if (eventTimes[3].back() - eventTimes[3].front() != 0)
-        orxonoxHUD_->setFPS(50000.0f/(eventTimes[3].back() - eventTimes[3].front()));
+        HUD::setFPS(50000.0f/(eventTimes[3].back() - eventTimes[3].front()));
 
       // Iterate through all Tickables and call their tick(dt) function