Changeset 1614 for code/branches/hud/src/orxonox/overlays/OverlayGroup.cc

Timestamp:

Jun 21, 2008, 2:35:24 PM (16 years ago)

Author:

rgrieder

Message:

• Dots on the Radar actually disappear now when a Ship gets destroyed…
• svn save to keep History of HUDText when renaming AND moving

File:

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

code/branches/hud/src/orxonox/overlays/OverlayGroup.cc

@@ -41 +41 @@
 
   SetConsoleCommand(OverlayGroup, toggleVisibility, false).setAccessLevel(AccessLevel::User);
-
-  OverlayGroup* OverlayGroup::hudInstance_s = 0;
+  SetConsoleCommand(OverlayGroup, scaleGroup, false).setAccessLevel(AccessLevel::User);
 
   using namespace Ogre;
@@ -50 +49 @@
   {
     RegisterObject(OverlayGroup);
-
-    // Singleton like in Ogre. Constructor and destructor are public,
-    // but the assert prevents from having multiple instances.
-    assert(hudInstance_s == 0);
-    hudInstance_s = this;
   }
 
   OverlayGroup::~OverlayGroup()
   {
-    if (this->isInitialized())
-    {
-    }
-
-    hudInstance_s = 0;
   }
 
@@ -104 +93 @@
   }
 
-  /*static*/ OverlayGroup& OverlayGroup::getHUD()
-  {
-    assert(hudInstance_s);
-    return *hudInstance_s;
-  }
 
   /*static*/ void OverlayGroup::toggleVisibility(const std::string& name)
   {
-    if (OverlayGroup::getHUD().hudElements_.find(name) != OverlayGroup::getHUD().hudElements_.end())
+    for (Iterator<OverlayGroup> it = ObjectList<OverlayGroup>::begin(); it; ++it)
     {
-      OverlayGroup::getHUD().hudElements_[name]->setVisibility(!OverlayGroup::getHUD().hudElements_[name]->isVisible());
+        if ((*it)->getName() == name)
+            (*it)->setVisibility(!((*it)->isVisible()));
     }
   }
 
+  /*static*/ void OverlayGroup::scaleGroup(const std::string& name, float scale)
+  {
+    for (Iterator<OverlayGroup> it = ObjectList<OverlayGroup>::begin(); it; ++it)
+    {
+        if ((*it)->getName() == name)
+            (*it)->scale(Vector2(scale, scale));
+    }
+  }
 }