Changeset 7892 in orxonox.OLD

Timestamp:

May 27, 2006, 3:47:27 AM (18 years ago)

Author:

bensch

Message:

gui: introduce inputline

Location:

branches/gui/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/graphics/render2D/element_2d.h (modified) (1 diff)
• lib/graphics/text_engine/text.cc (modified) (1 diff)
• lib/graphics/text_engine/text.h (modified) (1 diff)
• lib/gui/gl_gui/Makefile.am (modified) (2 diffs)
• lib/gui/gl_gui/glgui.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_inputline.cc (copied) (copied from branches/gui/src/lib/gui/gl_gui/glgui_text.cc) (4 diffs)
• lib/gui/gl_gui/glgui_inputline.h (copied) (copied from branches/gui/src/lib/gui/gl_gui/glgui_text.h) (2 diffs)
• lib/gui/gl_gui/glgui_textfield.cc (modified) (3 diffs)
• lib/gui/gl_gui/glgui_textfield.h (modified) (2 diffs)
• story_entities/simple_game_menu.cc (modified) (1 diff)

branches/gui/src/defs/class_id.h

@@ -332 +332 @@
   CL_GLGUI_BAR                  =    0x00000b30,
   CL_GLGUI_CURSOR               =    0x00000b50,
+  CL_GLGUI_INPUTLINE            =    0x00000b60,
+  CL_GLGUI_TEXTFIELD            =    0x00000b61,
 
   // QT_GUI

branches/gui/src/lib/graphics/render2D/element_2d.h

@@ -126 +126 @@
 
     inline void setSize2D(float x, float y) { this->size = Vector2D(x, y); };
+    inline void setSize2D(const Vector2D& size) { this->size = size; };
+    inline const Vector2D& getSize2D() const { return this->size; };
     void setSizeSoft2D(float x, float y, float bias = 1.0);
     inline void setSizeX2D(float x) { this->size.x = x; };

branches/gui/src/lib/graphics/text_engine/text.cc

@@ -136 +136 @@
   return this->text;
 }
+
+/**
+ * @brief removes char characters from the Text.
+ */
+void Text::removeCharacters(unsigned int chars)
+{
+  this->text.resize(this->text.size()-chars);
+}
+
 
 /**

branches/gui/src/lib/graphics/text_engine/text.h

@@ -38 +38 @@
     void append(const std::string& appendText);
     const std::string& operator<<(const std::string& appendText);
+    void removeCharacters(unsigned int chars);
 
     /// SETUP

branches/gui/src/lib/gui/gl_gui/Makefile.am

@@ -21 +21 @@
                 glgui_box.cc \
                 glgui_frame.cc \
+                glgui_inputline.cc \
+                glgui_textfield.cc \
                 glgui_window.cc \
                 glgui_cursor.cc
@@ -38 +40 @@
                 glgui_box.h \
                 glgui_frame.h \
+                glgui_inputline.h \
+                glgui_textfield.h \
                 glgui_window.h \
                 glgui_cursor.h

branches/gui/src/lib/gui/gl_gui/glgui.h

@@ -18 +18 @@
 #include "glgui_pushbutton.h"
 #include "glgui_cursor.h"
+#include "glgui_inputline.h"
+#include "glgui_textfield.h"
 
 namespace OrxGui

branches/gui/src/lib/gui/gl_gui/glgui_inputline.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
 
-#include "glgui_text.h"
-
-#include "text.h"
+#include "glgui_inputline.h"
 
 namespace OrxGui
@@ -25 +23 @@
    * standard constructor
   */
-  GLGuiText::GLGuiText ()
+  GLGuiInputLine::GLGuiInputLine ()
   {
     this->init();
@@ -35 +33 @@
    * standard deconstructor
   */
-  GLGuiText::~GLGuiText()
+  GLGuiInputLine::~GLGuiInputLine()
   {
   }
@@ -42 +40 @@
    * initializes the GUI-element
    */
-  void GLGuiText::init()
+  void GLGuiInputLine::init()
   {
-    this->setClassID(CL_GLGUI_, "GLGuiText");
+    this->setClassID(CL_GLGUI_INPUTLINE, "GLGuiInputLine");
+    this->text.setParent2D(this);
+    this->text.setFont("fonts/final_frontier.ttf", 20);
+
+    this->setText("SUPERTEST");
+    this->setSize2D( this->text.getSize2D());
 
   }
 
+  void GLGuiInputLine::setText(const std::string& text)
+  {
+    this->text.setText(text);
+  }
+
+  void GLGuiInputLine::append(const std::string& appendText)
+  {
+    this->text.append(appendText);
+
+  }
+
+  void GLGuiInputLine::removeCharacters(unsigned int chars)
+  {
+    this->text.removeCharacters(chars);
+  }
+
+
+
   /**
-   * draws the GLGuiText
+   * draws the GLGuiInputLine
    */
-  void GLGuiText::draw()
+  void GLGuiInputLine::draw() const
   {
+    this->startDraw();
+    GLGuiWidget::draw();
+
+    this->frontMaterial().select();
+    glBegin(GL_QUADS);
+
+    glTexCoord2i(0,0); glVertex2d(3, 3);
+    glTexCoord2i(0,1); glVertex2d(3, this->getSizeY2D() - 3);
+    glTexCoord2i(1,1); glVertex2d(this->getSizeX2D() - 3, this->getSizeY2D() -3);
+    glTexCoord2i(1,0); glVertex2d(this->getSizeX2D() - 3, 3);
+
+    glEnd();
+    this->endDraw();
   }
 }

branches/gui/src/lib/gui/gl_gui/glgui_inputline.h

@@ -1 +1 @@
 /*!
- * @file glgui_text.h
- * The gl_TEXT widget of th openglGUI
+ * @file glgui_inputline.h
+ * The gl_INPUTLINE widget of th openglGUI
  *
  */
 
-#ifndef _GLGUI_TEXT_H
-#define _GLGUI_TEXT_H
+#ifndef _GLGUI_INPUTLINE_H
+#define _GLGUI_INPUTLINE_H
 
 #include "glgui_widget.h"
+#include "text.h"
+
 
 // FORWARD DECLARATION
-class Text;
 namespace OrxGui
 {
@@ -19 +20 @@
    *
    */
-  class GLGuiText : public GLWidget
+  class GLGuiInputLine : public OrxGui::GLGuiWidget
   {
 
   public:
-    GLGuiText();
-    virtual ~GLGuiText();
+    GLGuiInputLine();
+    virtual ~GLGuiInputLine();
 
     void init();
 
-    virtual void draw();
+    void setText(const std::string& text);
+    void append(const std::string& appendText);
+    void removeCharacters(unsigned int chars);
+    const std::string& getName() const { return this->text.getText(); };
+
+    virtual void draw() const;
 
   private:
-    Text*             text;
+    Text                    text;
   };
 }
 
-#endif /* _GLGUI_TEXT_H */
+#endif /* _GLGUI_INPUTLINE_H */

branches/gui/src/lib/gui/gl_gui/glgui_textfield.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
 
-#include "glgui_textfield_.h"
+#include "glgui_textfield.h"
 namespace OrxGui
 {
@@ -42 +42 @@
   void GLGuiTextfield::init()
   {
-    this->setClassID(CL_GLGUI_, "GLGuiTextfield");
+    this->setClassID(CL_GLGUI_TEXTFIELD, "GLGuiTextfield");
+
 
   }
@@ -49 +50 @@
    * draws the GLGuiTextfield
    */
-  void GLGuiTextfield::draw()
+  void GLGuiTextfield::draw() const
   {
   }

branches/gui/src/lib/gui/gl_gui/glgui_textfield.h

@@ -9 +9 @@
 
 #include "glgui_widget.h"
+
+#include "text.h"
+#include <vector>
 
 // FORWARD DECLARATION
@@ -28 +31 @@
     void init();
 
-    virtual void draw();
+    void process(const Event& event);
+
+    virtual void draw() const;
 
   private:
-    std::list<Text*>      textLines;
+    std::vector<Text>        textLines;
 
   };

branches/gui/src/story_entities/simple_game_menu.cc

@@ -78 +78 @@
   rdnpb->setAbsCoor2D(200, 180);
   rdnpb->connectSignal(OrxGui::Signal_release, this, createExecutor<SimpleGameMenu>(&SimpleGameMenu::quitMenu));
+
+  OrxGui::GLGuiInputLine* input = new OrxGui::GLGuiInputLine();
+  input->show();
 
   OrxGui::GLGuiHandler::getInstance()->activateCursor();