Changeset 1993 for code/branches/objecthierarchy/src/orxonox/overlays

Timestamp:

Oct 22, 2008, 5:25:01 AM (16 years ago)

Author:

landauf

Message:

added several new classes

Location:

code/branches/objecthierarchy/src/orxonox/overlays

Files:

• OverlayGroup.cc (modified) (1 diff)
• OverlayText.cc (modified) (3 diffs)
• OverlayText.h (modified) (2 diffs)
• hud/HUDNavigation.cc (modified) (1 diff)

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

@@ -100 +100 @@
         }
         else
+        {
             hudElements_[element->getName()] = element;
+            element->setVisible(this->isVisible());
+        }
     }
 

code/branches/objecthierarchy/src/orxonox/overlays/OverlayText.cc

@@ -31 +31 @@
 
 #include <OgreOverlayManager.h>
-#include <OgreTextAreaOverlayElement.h>
 #include <OgrePanelOverlayElement.h>
 
@@ -68 +67 @@
 
         XMLPortParam(OverlayText, "font",     setFont,     getFont,     xmlElement, mode).defaultValues("Monofur");
+        XMLPortParam(OverlayText, "colour",   setColour,   getColour,   xmlElement, mode).defaultValues(ColourValue(1.0, 1.0, 1.0, 1.0));
         XMLPortParam(OverlayText, "caption",  setCaption,  getCaption,  xmlElement, mode).defaultValues("");
         XMLPortParam(OverlayText, "textSize", setTextSize, getTextSize, xmlElement, mode).defaultValues(1.0f);
+        XMLPortParamTemplate(OverlayText, "align", setAlignment, getAlignment, xmlElement, mode, const std::string&).defaultValues("left");
     }
 
@@ -84 +85 @@
         else
             return blankString;
+    }
+
+    void OverlayText::setColour(const ColourValue& colour)
+    {
+        if (this->text_)
+            this->text_->setColour(colour);
+    }
+
+    const ColourValue& OverlayText::getColour() const
+    {
+        if (this->text_)
+            return this->text_->getColour();
+        else
+            return ColourValue::White;
+    }
+
+    void OverlayText::setAlignment(Ogre::TextAreaOverlayElement::Alignment alignment)
+    {
+        if (this->text_)
+            this->text_->setAlignment(alignment);
+    }
+
+    void OverlayText::setAlignment(const std::string& alignment)
+    {
+        if (alignment == "right")
+            this->setAlignment(Ogre::TextAreaOverlayElement::Right);
+        else if (alignment == "center")
+            this->setAlignment(Ogre::TextAreaOverlayElement::Center);
+        else // "left" and default
+            this->setAlignment(Ogre::TextAreaOverlayElement::Left);
+    }
+
+    std::string OverlayText::getAlignment() const
+    {
+        if (this->text_)
+        {
+            Ogre::TextAreaOverlayElement::Alignment alignment = this->text_->getAlignment();
+
+            switch (alignment)
+            {
+                case Ogre::TextAreaOverlayElement::Right:
+                    return "right";
+                case Ogre::TextAreaOverlayElement::Center:
+                    return "center";
+                case Ogre::TextAreaOverlayElement::Left:
+                default:;
+            }
+        }
+        return "left";
+    }
+
+    void OverlayText::setCaption(const std::string& caption)
+    {
+        this->caption_ = caption;
+        this->text_->setCaption(caption);
     }
 

code/branches/objecthierarchy/src/orxonox/overlays/OverlayText.h

@@ -34 +34 @@
 #include <string>
 #include <OgrePrerequisites.h>
+#include <OgreTextAreaOverlayElement.h>
 #include "OrxonoxOverlay.h"
 
@@ -49 +50 @@
         virtual void sizeChanged();
 
-        void setCaption(const std::string& caption) { this->caption_ = caption; }
+        void setCaption(const std::string& caption);
         const std::string& getCaption() const       { return this->caption_; }
 
         void setFont(const std::string& font);
         const std::string& getFont() const;
+
+        void setColour(const ColourValue& colour);
+        const ColourValue& getColour() const;
+
+        void setAlignment(Ogre::TextAreaOverlayElement::Alignment alignment);
+        void setAlignment(const std::string& alignment);
+        std::string getAlignment() const;
 
         void setTextSize(float size) { this->setSize(Vector2(size, size)); }

code/branches/objecthierarchy/src/orxonox/overlays/hud/HUDNavigation.cc

@@ -41 +41 @@
 #include "core/XMLPort.h"
 #include "objects/Radar.h"
-#include "objects/CameraHandler.h"
 
 namespace orxonox