Changeset 7453 in orxonox.OLD

Timestamp:

Apr 29, 2006, 10:08:38 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Size is local to text now

Location:

trunk/src/lib

Files:

• BuildLibs.am (modified) (2 diffs)
• graphics/render2D/render_2d.cc (modified) (1 diff)
• graphics/text_engine/multi_line_text.cc (modified) (2 diffs)
• graphics/text_engine/text.cc (modified) (2 diffs)
• graphics/text_engine/text.h (modified) (4 diffs)

trunk/src/lib/BuildLibs.am

@@ -2 +2 @@
 libORXlibs_a_LIBRARIES_ = \
                 $(LIB_PREFIX)/libORXlibs.a \
-                $(LIB_PREFIX)/shell/libORXshell.a \
                 $(LIB_PREFIX)/gui/gtk_gui/libORXgui.a \
                 $(LIB_PREFIX)/gui/gl_gui/libORXglgui.a \
@@ -19 +18 @@
                 $(LIB_PREFIX)/parser/cmdline_parser/libCmdLineParser.a \
                 $(LIB_PREFIX)/parser/ini_parser/libIniParser.a \
+                $(LIB_PREFIX)/shell/libORXshell.a \
                 $(LIB_PREFIX)/math/libORXmath.a \
                 $(LIB_PREFIX)/libORXlibs.a

trunk/src/lib/graphics/render2D/render_2d.cc

@@ -21 +21 @@
 #include "class_list.h"
 #include "element_2d.h"
-
-#include <math.h>
 
 #include "shell_command.h"

trunk/src/lib/graphics/text_engine/multi_line_text.cc

@@ -117 +117 @@
 {
   this->lineEnds.clear();
-  this->lineEnds.push_back(0);
   float width = 0.0f;
-  // TODO make size local to this (not using the one from Element2D.
   float maxWidth = this->lineWidth / this->getSize();
 
@@ -133 +131 @@
       width += this->getFont()->getGlyphArray()[this->getText()[i]]->advance;
   }
+  this->setSizeY2D(this->lineEnds.size() * (this->lineSpacing+this->getFont()->getMaxHeight()));
 }

trunk/src/lib/graphics/text_engine/text.cc

@@ -39 +39 @@
   this->blending = TEXT_DEFAULT_BLENDING;
   this->color = TEXT_DEFAULT_COLOR;
-  this->setSize(TEXT_DEFAULT_SIZE);
-  this->setText("");
-
 
   if (!fontFile.empty())
     this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
-  this->setSizeY2D(textSize);
+
+  this->setSize(TEXT_DEFAULT_SIZE);
 }
 
@@ -99 +97 @@
   this->setupTextWidth();
 }
+
+
+/**
+ * @brief sets the Size of the Font
+ * @param size :the size of the Text
+ */
+void Text::setSize(float size)
+{
+  this->size = size;
+  this->setSizeY2D(size);
+  this->setupTextWidth();
+}
+
 
 /**

trunk/src/lib/graphics/text_engine/text.h

@@ -37 +37 @@
     /** @param r red @param g green @param b blue @brief sets the Color of the Text to render (values in [0-1]) */
     void setColor(float r, float g, float b) { this->color = Vector(r, g, b); };
-    /** @param size the Size of the Text @brief sets the Size of the Font */
-    inline void setSize(float size) { this->setSizeY2D(size); };
+    void setSize(float size);
 
     /// RETRIEVE
@@ -50 +49 @@
     inline const Vector& getColor() const { return this->color; };
     /** @returns the Size of the Text */
-    inline float getSize() const { return this->getSizeY2D(); };
+    inline float getSize() const { return this->size; };
 
     virtual void draw() const;
@@ -58 +57 @@
   protected:
     virtual void setupTextWidth();
+
   private:
     Font*             font;           //!< Font of this text
@@ -64 +64 @@
     Vector            color;          //!< The color of the font.
     float             blending;       //!< The blending intensity.
+    float             size;           //!< The size of the Text.
 };