Changeset 2024 for code/branches/objecthierarchy/src/orxonox/overlays/OverlayText.cc

Timestamp:

Oct 28, 2008, 3:05:17 AM (16 years ago)

Author:

landauf

Message:

added spaceship

File:

• code/branches/objecthierarchy/src/orxonox/overlays/OverlayText.cc (modified) (3 diffs)

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

@@ -65 +65 @@
         }
 
-        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");
+        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);
+        XMLPortParam(OverlayText, "align",    setAlignmentString, getAlignmentString, xmlElement, mode).defaultValues("left");
     }
 
@@ -106 +106 @@
     }
 
-    void OverlayText::setAlignment(const std::string& alignment)
+    Ogre::TextAreaOverlayElement::Alignment OverlayText::getAlignment() const
+    {
+        if (this->text_)
+            return this->text_->getAlignment();
+        else
+            return Ogre::TextAreaOverlayElement::Left;
+    }
+
+    void OverlayText::setAlignmentString(const std::string& alignment)
     {
         if (alignment == "right")
@@ -116 +124 @@
     }
 
-    std::string OverlayText::getAlignment() const
+    std::string OverlayText::getAlignmentString() const
     {
         if (this->text_)