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

Timestamp:

Jun 15, 2008, 1:09:07 AM (17 years ago)

Author:

rgrieder

Message:

• adjusted Radar to fit in XML loading scheme
• OverlayGroup should be more or less what I imagine for now (only supports scale method to scale the entire HUD)
• singletonized HUDNavigation (and HUDRadar of course): These are temporary hacks!

File:

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

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

@@ -95 +95 @@
    * Create a new instance of Orxonox. Avoid doing any actual work here.
    */
-  Orxonox::Orxonox() :
-    ogre_(0),
-    //auMan_(0),
-    timer_(0),
+  Orxonox::Orxonox()
+    : ogre_(0)
+    , startLevel_(0)
+    , hud_(0)
+    //, auMan_(0)
+    , timer_(0)
     // turn on frame smoothing by setting a value different from 0
-    frameSmoothingTime_(0.0f),
-    //orxonoxHUD_(0),
-    bAbort_(false),
-    timefactor_(1.0f),
-    mode_(STANDALONE),
-    serverIp_(""),
-    serverPort_(NETWORK_PORT)
+    , frameSmoothingTime_(0.0f)
+    //orxonoxHUD_(0)
+    , bAbort_(false)
+    , timefactor_(1.0f)
+    , mode_(STANDALONE)
+    , serverIp_("")
+    , serverPort_(NETWORK_PORT)
   {
   }
@@ -116 +118 @@
   {
     // keep in mind: the order of deletion is very important!
-    /*if (this->orxonoxHUD_)
-      delete this->orxonoxHUD_;*/
+    Loader::unload(startLevel_);
+    if (this->startLevel_)
+      delete this->startLevel_;
+
+    Loader::unload(hud_);
+    if (this->hud_)
+      delete this->hud_;
+
     Loader::close();
-    InputManager::destroy();
     //if (this->auMan_)
     //  delete this->auMan_;
@@ -125 +132 @@
     if (this->timer_)
       delete this->timer_;
+    InputManager::destroy();
     GraphicsEngine::getSingleton().destroy();
 
@@ -335 +343 @@
     COUT(3) << "Orxonox: Loading HUD" << std::endl;
 
-    Level* hud = new Level(Settings::getDataPath() + "overlay/hud.oxo");
-    Loader::load(hud);
+    hud_ = new Level(Settings::getDataPath() + "overlay/hud.oxo");
+    Loader::load(hud_);
 
     return true;
@@ -397 +405 @@
   bool Orxonox::loadScene()
   {
-    Level* startlevel = new Level("levels/sample.oxw");
-    Loader::open(startlevel);
+    startLevel_ = new Level("levels/sample.oxw");
+    Loader::open(startLevel_);
 
     return true;