Changeset 7919 in orxonox.OLD for trunk/src/lib/graphics/text_engine

Timestamp:

May 28, 2006, 3:48:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

Location:

trunk/src/lib/graphics/text_engine

Files:

• multi_line_text.cc (modified) (2 diffs)
• text.cc (modified) (6 diffs)
• text.h (modified) (1 diff)

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

@@ -64 +64 @@
     return;
   glPushMatrix();
+  glPushAttrib(GL_ENABLE_BIT);
   // transform for alignment.
   // TODO make the Stuff with the alignment
@@ -117 +118 @@
   }
   glEnd();
+  glPopAttrib();
   glPopMatrix();
 }

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

@@ -36 +36 @@
   this->font = NULL;
   this->size = textSize;
+  this->setSizeY2D(size);
   this->blending = TEXT_DEFAULT_BLENDING;
   this->color = TEXT_DEFAULT_COLOR;
@@ -127 +128 @@
 
 /**
+ * @brief appends one Character to the String.
+ */
+void Text::appendCharacter(char character)
+{
+  this->text += character;
+  this->setupTextWidth();
+}
+
+
+/**
  * @brief append some text to the already existing Text.
  * @param appendText The text to append to this Text.
@@ -135 +146 @@
   return this->text;
 }
+
+/**
+ * @brief removes char characters from the Text.
+ *
+ * @note this function checks, if the count can be removed, and if so does it.
+ * Otherwise the maximum count of characters will be removed.
+ */
+void Text::removeCharacters(unsigned int chars)
+{
+  if (text.size() > chars)
+    this->text.resize(this->text.size()-chars);
+  else if (!text.empty())
+    text.clear();
+  this->setupTextWidth();
+}
+
 
 /**
@@ -188 +215 @@
     return;
   glPushMatrix();
+  glPushAttrib(GL_ENABLE_BIT);
   // transform for alignment.
   if (this->getAlignment() == TEXT_ALIGN_RIGHT)
@@ -229 +257 @@
   }
   glEnd();
+  glPopAttrib();
   glPopMatrix();
 }
@@ -242 +271 @@
     if(this->font->getGlyphArray()[this->text[i]] != NULL)
       width += this->font->getGlyphArray()[this->text[i]]->advance;
-  this->setSizeX2D(width *this->getSize());
+  this->setSizeX2D(width * this->getSize());
 }
 

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

@@ -37 +37 @@
     void setText(const std::string& text);
     void append(const std::string& appendText);
+    void appendCharacter(char character);
     const std::string& operator<<(const std::string& appendText);
+    void removeCharacters(unsigned int chars);
 
     /// SETUP