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

Timestamp:

Apr 29, 2006, 9:49:11 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Test the MultiLineText in this revision

File:

• trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified) (2 diffs)

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

@@ -80 +80 @@
 
   glBegin(GL_QUADS);
-  for (unsigned int i = 0; i < this->getText().size(); i++)
+  for (unsigned int i = 0; i < this->getText().size(); ++i)
   {
-    if (unlikely(tmpGlyph->character == '\n' || i == this->lineEnds[lineNumber]))
+    if (unlikely(this->getText()[i] == '\n' || i == this->lineEnds[lineNumber]))
     {
-    // go to the next Line.
-      lineNumber++;
+      // go to the next Line.
+      ++lineNumber;
       posX = 0.0f;
       posY += this->lineSpacing + this->getFont()->getMaxHeight();
@@ -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.