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

Timestamp:

Jun 22, 2008, 12:06:55 AM (16 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.h (modified) (2 diffs)

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

@@ -39 +39 @@
 namespace orxonox
 {
-    class HUDBar;
-    class OrxonoxOverlay;
-
     class _OrxonoxExport OverlayGroup : public BaseObject
     {
-      public:
+    public:
         OverlayGroup();
         ~OverlayGroup();
 
-        virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
-
-        void scale(const Vector2& scale);
-        Vector2 getScale() const { return this->scale_; }
+        void XMLPort(Element& xmlElement, XMLPort::Mode mode);
 
         static void toggleVisibility(const std::string& name);
         static void scaleGroup(const std::string& name, float scale);
+        static void scrollGroup(const std::string& name, const Vector2& scroll);
+        static void rotateGroup(const std::string& name, Radian angle);
 
-      private:
-        OverlayGroup(const OverlayGroup& instance);
+    private:
+        void scale(const Vector2& scale) { this->setScale(scale * this->scale_); }
+        void setScale(const Vector2& scale);
+        Vector2 getScale() const { return this->scale_; }
+
+        void scroll(const Vector2& scroll) { this->setScroll(scroll + this->scroll_); }
+        void setScroll(const Vector2& scroll);
+        Vector2 getScroll() const { return this->scale_; }
 
         void addElement(OrxonoxOverlay* element);
@@ -64 +66 @@
         std::map<std::string, OrxonoxOverlay*> hudElements_;
         Vector2 scale_;
+        Vector2 scroll_;
     };
 }