Changeset 1588 for code/branches/hud/src/orxonox/Orxonox.cc

Timestamp:

Jun 11, 2008, 12:21:42 AM (16 years ago)

Author:

rgrieder

Message:

• added XML loadable HUD
• Radar and navi are not yet done
• explanations follow with when things are finished

File:

• code/branches/hud/src/orxonox/Orxonox.cc (modified) (5 diffs)

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

@@ -101 +101 @@
     // turn on frame smoothing by setting a value different from 0
     frameSmoothingTime_(0.0f),
-    orxonoxHUD_(0),
+    //orxonoxHUD_(0),
     bAbort_(false),
     timefactor_(1.0f),
@@ -116 +116 @@
   {
     // keep in mind: the order of deletion is very important!
-    this->orxonoxHUD_->destroy();
+    /*if (this->orxonoxHUD_)
+      delete this->orxonoxHUD_;*/
     Loader::close();
     InputManager::destroy();
@@ -332 +333 @@
 
     // Load the HUD
-    COUT(3) << "Orxonox: Loading HUD..." << std::endl;
-    orxonoxHUD_ = &HUD::getSingleton();
-    orxonoxHUD_->initialise();
+    COUT(3) << "Orxonox: Loading HUD" << std::endl;
+
+    Level* hud = new Level("hud/hud.oxh");
+    Loader::load(hud);
 
     return true;
@@ -437 +439 @@
 //    clock_t time = 0;
 
-    //Ogre::SceneManager* mSceneMgr = GraphicsEngine::getSingleton().getSceneManager();
-    //Ogre::Viewport* mViewport = mSceneMgr->getCurrentViewport();
-
-    //Ogre::CompositorManager::getSingleton().addCompositor(mViewport, "Bloom");
-    //Ogre::CompositorManager::getSingleton().addCompositor(mViewport, "MotionBlur");
-
     COUT(3) << "Orxonox: Starting the main loop." << std::endl;
     while (!bAbort_)
@@ -459 +455 @@
       if (mode_ != DEDICATED && frameTime > 0.4f)
       {
-        HUD::getSingleton().setRenderTimeRatio(renderTime / frameTime);
+        GraphicsEngine::getSingleton().setAverageRTR(renderTime / frameTime);
         frameTime = 0.0f;
         renderTime = 0.0f;