Changeset 7451 in orxonox.OLD for trunk

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: Test the MultiLineText in this revision

Location:

trunk/src/lib

Files:

• BuildLibs.am (modified) (2 diffs)
• graphics/text_engine/multi_line_text.cc (modified) (2 diffs)
• shell/shell_input.cc (modified) (1 diff)
• shell/shell_input.h (modified) (2 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 \
@@ -18 +19 @@
                 $(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/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.

trunk/src/lib/shell/shell_input.cc

@@ -46 +46 @@
   */
   ShellInput::ShellInput ()
-      : Text ("")
-  {
+      : MultiLineText ("")
+  {
+    this->setLineWidth(100);
+
     this->pressedKey = SDLK_FIRST;
     this->setClassID(CL_SHELL_INPUT, "ShellInput");

trunk/src/lib/shell/shell_input.h

@@ -10 +10 @@
 #define _SHELL_INPUT_H
 
-#include "text.h"
+#include "multi_line_text.h"
 #include "event_listener.h"
 #include "shell_completion.h"
@@ -28 +28 @@
    * [UP] and [DOWN] move through the history of allready given commands.
    */
-  class ShellInput : public Text,  public EventListener
+  class ShellInput : public MultiLineText,  public EventListener
   {