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

Timestamp:

Jun 22, 2008, 12:06:55 AM (17 years ago)

Author:

rgrieder

Message:

• added blankString to String so you can return ""; even if it's a const std::string&
• fixed several bugs with aspect correct and margin alignment
• added console commands for OrxonoxOverlays and OverlayGroups for rotate, scale and scroll (you can access the by name (from name=.. in xml file), e.g. "OrxonoxOverlay rotateOverlay SpeedBar 90)
• converted everything in overlays/ to 4 spaces/tab
• removed all using namespace Ogre;
• added background_ Panel to OrxonoxOverlay, since most of the derived classes can use that
• should work now, but I'll have to test on a tardis box first

File:

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

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

@@ -30 +30 @@
 #include "OverlayGroup.h"
 
-#include <assert.h>
 #include "core/Debug.h"
 #include "core/ConsoleCommand.h"
@@ -38 +37 @@
 namespace orxonox
 {
-  CreateFactory(OverlayGroup);
+    CreateFactory(OverlayGroup);
 
-  SetConsoleCommand(OverlayGroup, toggleVisibility, false).setAccessLevel(AccessLevel::User);
-  SetConsoleCommand(OverlayGroup, scaleGroup, false).setAccessLevel(AccessLevel::User);
+    SetConsoleCommand(OverlayGroup, toggleVisibility, false).setAccessLevel(AccessLevel::User);
+    SetConsoleCommand(OverlayGroup, scaleGroup, false).setAccessLevel(AccessLevel::User);
+    SetConsoleCommand(OverlayGroup, scrollGroup, false).setAccessLevel(AccessLevel::User);
 
-  using namespace Ogre;
+    OverlayGroup::OverlayGroup()
+        : scale_(1.0, 1.0)
+    {
+        RegisterObject(OverlayGroup);
+    }
 
-  OverlayGroup::OverlayGroup()
-    : scale_(1.0, 1.0)
-  {
-    RegisterObject(OverlayGroup);
-  }
+    OverlayGroup::~OverlayGroup()
+    {
+    }
 
-  OverlayGroup::~OverlayGroup()
-  {
-  }
+    void OverlayGroup::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+    {
+        BaseObject::XMLPort(xmlElement, mode);
 
-  void OverlayGroup::XMLPort(Element& xmlElement, XMLPort::Mode mode)
-  {
-    BaseObject::XMLPort(xmlElement, mode);
+        XMLPortParam(OverlayGroup, "scale", setScale, getScale, xmlElement, mode);
+        XMLPortParam(OverlayGroup, "scroll", setScroll, getScroll, xmlElement, mode);
+        XMLPortObject(OverlayGroup, OrxonoxOverlay, "", addElement, getElement, xmlElement, mode, false, true);
+    }
 
-    XMLPortParam(OverlayGroup, "scale", scale, getScale, xmlElement, mode);
-    XMLPortObject(OverlayGroup, OrxonoxOverlay, "", addElement, getElement, xmlElement, mode, false, true);
-  }
+    void OverlayGroup::setScale(const Vector2& scale)
+    {
+        for (std::map<std::string, OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+            (*it).second->scale(scale / this->scale_);
+        this->scale_ = scale;
+    }
 
-  void OverlayGroup::scale(const Vector2& scale)
-  {
-    for (std::map<std::string, OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-      (*it).second->scale(scale);
-    this->scale_ = scale;
-  }
+    void OverlayGroup::setScroll(const Vector2& scroll)
+    {
+        for (std::map<std::string, OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+            (*it).second->scroll(scroll - this->scroll_);
+        this->scroll_ = scroll;
+    }
 
-  void OverlayGroup::addElement(OrxonoxOverlay* element)
-  {
-    if (hudElements_.find(element->getName()) != hudElements_.end())
+    void OverlayGroup::addElement(OrxonoxOverlay* element)
     {
-      COUT(1) << "Ambiguous names encountered while load the HUD overlays" << std::endl;
+        if (hudElements_.find(element->getName()) != hudElements_.end())
+        {
+            COUT(1) << "Ambiguous names encountered while load the HUD overlays" << std::endl;
+        }
+        else
+            hudElements_[element->getName()] = element;
     }
-    else
-      hudElements_[element->getName()] = element;
-  }
 
-  OrxonoxOverlay* OverlayGroup::getElement(unsigned int index)
-  {
-    if (index < this->hudElements_.size())
+    OrxonoxOverlay* OverlayGroup::getElement(unsigned int index)
     {
-      std::map<std::string, OrxonoxOverlay*>::const_iterator it = hudElements_.begin();
-      for (unsigned int i = 0; i != index; ++it, ++i)
-        ;
-      return (*it).second;
+        if (index < this->hudElements_.size())
+        {
+            std::map<std::string, OrxonoxOverlay*>::const_iterator it = hudElements_.begin();
+            for (unsigned int i = 0; i != index; ++it, ++i)
+                ;
+            return (*it).second;
+        }
+        else
+            return 0;
     }
-    else
-      return 0;
-  }
 
 
-  /*static*/ void OverlayGroup::toggleVisibility(const std::string& name)
-  {
-    for (Iterator<OverlayGroup> it = ObjectList<OverlayGroup>::begin(); it; ++it)
+    /*static*/ void OverlayGroup::toggleVisibility(const std::string& name)
     {
-        if ((*it)->getName() == name)
-            (*it)->setVisibility(!((*it)->isVisible()));
+        for (Iterator<OverlayGroup> it = ObjectList<OverlayGroup>::begin(); it; ++it)
+        {
+            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)
+    /*static*/ void OverlayGroup::scaleGroup(const std::string& name, float scale)
     {
-        if ((*it)->getName() == name)
-            (*it)->scale(Vector2(scale, scale));
+        for (Iterator<OverlayGroup> it = ObjectList<OverlayGroup>::begin(); it; ++it)
+        {
+            if ((*it)->getName() == name)
+                (*it)->scale(Vector2(scale, scale));
+        }
     }
-  }
+
+    /*static*/ void OverlayGroup::scrollGroup(const std::string& name, const Vector2& scroll)
+    {
+        for (Iterator<OverlayGroup> it = ObjectList<OverlayGroup>::begin(); it; ++it)
+        {
+            if ((*it)->getName() == name)
+                (*it)->scroll(scroll);
+        }
+    }
 }