Changeset 1615 for code/branches/hud/src/orxonox/overlays/OverlayText.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/OverlayText.h (moved) (moved from code/branches/hud/src/orxonox/overlays/HUDText.h) (2 diffs)

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

@@ -27 +27 @@
  */
 
-#ifndef _HUDText_H__
-#define _HUDText_H__
+#ifndef _OverlayText_H__
+#define _OverlayText_H__
 
 #include "OrxonoxPrereqs.h"
@@ -34 +34 @@
 #include <string>
 #include <OgrePrerequisites.h>
-#include "overlays/OrxonoxOverlay.h"
+#include "OrxonoxOverlay.h"
 
 namespace orxonox
 {
-  class _OrxonoxExport HUDText : public OrxonoxOverlay
-  {
-  public:
-    HUDText();
-    virtual ~HUDText();
+    class _OrxonoxExport OverlayText : public OrxonoxOverlay
+    {
+    public:
+        OverlayText();
+        virtual ~OverlayText();
 
-    virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
 
-  protected:
-    void setCaption(const std::string& caption);
-    const std::string& getCaption() const;
-    void setFont(const std::string& font);
-    std::string getFont() const;
+    protected:
+        virtual void sizeChanged();
 
-    Ogre::TextAreaOverlayElement* text_;
+        void setCaption(const std::string& caption) { this->caption_ = caption; }
+        const std::string& getCaption() const       { return this->caption_; }
 
-  private:
-    std::string caption_;
-  };
+        void setFont(const std::string& font);
+        const std::string& getFont() const;
+
+        void setTextSize(float size) { this->setSize(Vector2(size, size)); }
+        float getTextSize() const    { return this->getUncorrectedSize().y; }
+
+        Ogre::TextAreaOverlayElement* text_;
+
+    private:
+        std::string caption_;
+    };
 }
-#endif /* _HUDText_H__ */
+#endif /* _OverlayText_H__ */