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

Timestamp:

Jun 14, 2008, 6:37:12 PM (17 years ago)

Author:

rgrieder

Message:

• new folder structure for overlays:

orxonox/

…
overlays/

console/
hud/

• Navigation —> HUDNavigation
• HUD —> OverlayGroup (not yet begun with that except renaming and getHUD() instead of getSingleton())
• moved HUD.oxo (file ending should stand for orxonox overlay) to media repository in overlay folder
• fixed a bug with console noiseSize_ config value (was inverted..)

File:

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

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

@@ -69 +69 @@
 
 // objects and tools
-#include "hud/HUD.h"
-#include "console/InGameConsole.h"
+#include "overlays/OverlayGroup.h"
+#include "overlays/console/InGameConsole.h"
 #include "objects/Tickable.h"
 #include "tools/ParticleInterface.h"
@@ -335 +335 @@
     COUT(3) << "Orxonox: Loading HUD" << std::endl;
 
-    Level* hud = new Level("hud/hud.oxh");
+    Level* hud = new Level(Settings::getDataPath() + "overlay/hud.oxo");
     Loader::load(hud);
 
@@ -451 +451 @@
       frameTime += evt.timeSinceLastFrame;
 
-      // show the current time in the HUD
-      // HUD::getSingleton().setTime(now);
+      // OverlayGroup::getHUD().setTime(now);
       if (mode_ != DEDICATED && frameTime > 0.4f)
       {