Changeset 7457 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Apr 30, 2006, 4:28:17 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Size2D is ok now for the MultiLineText

Location:

trunk/src/lib/graphics

Files:

• render2D/render_2d.cc (modified) (1 diff)
• text_engine/multi_line_text.cc (modified) (3 diffs)

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

@@ -21 +21 @@
 #include "class_list.h"
 #include "element_2d.h"
-
-#include "shell_command.h"
-SHELL_COMMAND(toggleNodeVisibility, Render2D, toggleNodesVisibility);
 
 using namespace std;

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

@@ -32 +32 @@
 
   this->lineSpacing = 1.0f;
-  this->lineWidth = 100.0f;
-  this->setupTextWidth();
+  this->setLineWidth(100.0f);
 }
 
@@ -43 +42 @@
 {
   this->lineWidth = lineWidth;
+  this->setSizeX2D(lineWidth);
   this->setupTextWidth();
 }
@@ -141 +141 @@
       width += this->getFont()->getGlyphArray()[this->getText()[i]]->advance;
   }
-  this->setSizeY2D(this->lineEnds.size() * (this->lineSpacing + this->getFont()->getMaxHeight()));
+  this->setSizeY2D((this->lineEnds.size()+1) * (this->lineSpacing + this->getFont()->getMaxHeight()));
 }