Changeset 7457 in orxonox.OLD for trunk

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

Files:

• BuildLibs.am (modified) (1 diff)
• graphics/render2D/render_2d.cc (modified) (1 diff)
• graphics/text_engine/multi_line_text.cc (modified) (3 diffs)
• shell/shell_input.cc (modified) (1 diff)
• shell/shell_input.h (modified) (2 diffs)
• shell/some_shell_commands.cc (modified) (1 diff)

trunk/src/lib/BuildLibs.am

@@ -19 +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/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()));
 }

trunk/src/lib/shell/shell_input.cc

@@ -42 +42 @@
   */
   ShellInput::ShellInput ()
-      : Text ("")
+      : MultiLineText ("")
   {
     this->pressedKey = SDLK_FIRST;

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
   {
 

trunk/src/lib/shell/some_shell_commands.cc

@@ -35 +35 @@
   SHELL_COMMAND(setPosition, PNode, setAbsCoor);
 
+#include "render_2d.h"
+  SHELL_COMMAND(toggleNodeVisibility, Render2D, toggleNodesVisibility);
+
 
 #include "material.h"