Changeset 1601 for code/branches/hud/src/orxonox/objects/SpaceShip.cc

Timestamp:

Jun 14, 2008, 6:37:12 PM (16 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/objects/SpaceShip.cc (modified) (3 diffs)

code/branches/hud/src/orxonox/objects/SpaceShip.cc

@@ -49 +49 @@
 #include "core/ConsoleCommand.h"
 #include "network/Client.h"
-#include "hud/HUD.h"
+#include "overlays/OverlayGroup.h"
 
 namespace orxonox
@@ -152 +152 @@
 
             if (!this->myShip_)
-                HUD::getSingleton().removeRadarObject(this);
+                OverlayGroup::getHUD().removeRadarObject(this);
         }
     }
@@ -161 +161 @@
           myShip_=true;
         else
-          HUD::getSingleton().addRadarObject(this, this->getProjectileColour());
+          OverlayGroup::getHUD().addRadarObject(this, this->getProjectileColour());
       }
       if(Model::create())