Changeset 8008 in orxonox.OLD for branches/gui/src

Timestamp:

May 31, 2006, 1:30:25 AM (19 years ago)

Author:

bensch

Message:

orxonox/gui: image-implementation

Location:

branches/gui/src

Files:

• defs/class_id.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_image.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_image.h (modified) (2 diffs)
• lib/gui/gl_gui/glgui_pushbutton.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_textfield.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.h (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (1 diff)

branches/gui/src/defs/class_id.h

@@ -336 +336 @@
   CL_GLGUI_INPUTLINE            =    0x00000b60,
   CL_GLGUI_TEXTFIELD            =    0x00000b61,
+  CL_GLGUI_IMAGE                =    0x00000b70,
 
   // QT_GUI

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

@@ -25 +25 @@
                 glgui_inputline.cc \
                 glgui_textfield.cc \
+                glgui_image.cc \
                 glgui_window.cc \
                 glgui_cursor.cc
@@ -47 +48 @@
                 glgui_inputline.h \
                 glgui_textfield.h \
+                glgui_image.h \
                 glgui_window.h \
                 glgui_cursor.h

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

@@ -22 +22 @@
 #include "glgui_inputline.h"
 #include "glgui_textfield.h"
+#include "glgui_image.h"
 
 

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

@@ -43 +43 @@
   void GLGuiImage::init()
   {
-    this->setClassID(CL_GLGUI_, "GLGuiImage");
+    this->setClassID(CL_GLGUI_IMAGE, "GLGuiImage");
+
+    this->frontMaterial().setDiffuseMap(this->texture);
+
+    this->resize();
+  }
+
+
+  void GLGuiImage::loadImageFromTexture(const Texture& texture)
+  {
+    this->texture = texture;
+  }
+
+  void GLGuiImage::loadImageFromFile(const std::string& fileName)
+  {
+    this->texture.loadImage(fileName);
+  }
+
+  void GLGuiImage::loadImageFromSDLSurface(SDL_Surface* surface)
+  {
+    //this->texture.loadSurface(surface);
+  }
+
+  void GLGuiImage::loadImageFromDisplayList(GLuint texture)
+  {
+//    this->texture.setTexture(texture);
+  }
+
+  void GLGuiImage::resize()
+  {
+    this->frontRect().setTopLeft(1, 1);
+    this->frontRect().setSize(this->getSizeX2D() -2, this->getSizeY2D() -2);
+    GLGuiWidget::resize();
+  }
+
+
+  /**
+   * @brief draws the GLGuiImage
+   */
+  void GLGuiImage::draw() const
+  {
+    this->beginDraw();
+    GLGuiWidget::draw();
+
+    this->frontMaterial().select();
+    this->drawRect(this->frontRect());
+    this->endDraw();
+
 
   }
-
-  /**
-   * draws the GLGuiImage
-   */
-  void GLGuiImage::draw()
-  {
-  }
 }

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

@@ -8 +8 @@
 #define _GLGUI_IMAGE_H
 
-#include "base_object.h"
+#include "glgui_widget.h"
 
 // FORWARD DECLARATION
@@ -26 +26 @@
     virtual ~GLGuiImage();
 
-    void init();
-    void loadImageFromFile(const char* fileName);
+    void loadImageFromTexture(const Texture& texture);
+
+    void loadImageFromFile(const std::string& fileName);
     void loadImageFromSDLSurface(SDL_Surface* surface);
-    void loadImageFromDisplayList(GLuint displayList);
+    void loadImageFromDisplayList(GLuint texture);
 
-    virtual void draw();
+    virtual void draw() const;
+
+    DeclareSignal0(imageChanged);
 
   private:
+    void init();
+    virtual void resize();
 
+  private:
+    Texture       texture;
   };
 }

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

@@ -98 +98 @@
 
     this->frontMaterial().select();
-    glBegin(GL_QUADS);
-
-    glTexCoord2i(0,0); glVertex2d(1, 1);
-    glTexCoord2i(0,1); glVertex2d(1, this->getSizeY2D() - 1);
-    glTexCoord2i(1,1); glVertex2d(this->getSizeX2D() - 1, this->getSizeY2D() -1);
-    glTexCoord2i(1,0); glVertex2d(this->getSizeX2D() - 1, 1);
-
-    glEnd();
+    this->drawRect(this->frontRect());
     this->endDraw();
     //   this->label->draw();

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

@@ -43 +43 @@
   {
     this->setClassID(CL_GLGUI_TEXTFIELD, "GLGuiTextfield");
-
-
   }
 
   /**
-   * draws the GLGuiTextfield
+   * @brief draws the GLGuiTextfield
    */
   void GLGuiTextfield::draw() const
   {
+    this->beginDraw();
+    GLGuiWidget::draw();
+
+    this->frontMaterial().select();
+    this->drawRect(this->frontRect());
+    this->endDraw();
   }
 }

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

@@ -163 +163 @@
   ;
 
+  void GLGuiWidget::setWidgetSize(const Vector2D& size)
+  {
+    this->setSize2D(size);
+    this->resize();
+
+  }
+
+
+  void GLGuiWidget::setWidgetSize(float x, float y)
+  {
+    this->setWidgetSize(Vector2D(x, y));
+  }
 
 

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

@@ -88 +88 @@
     void setBorderSize(float borderSize);
 
+    void setWidgetSize(const Vector2D& size);
+    void setWidgetSize(float x, float y);
+
 
     void setBackgroundColor(float x, float y, float z) { this->backMaterial().setDiffuse(x,y,z); };

branches/gui/src/story_entities/simple_game_menu.cc

@@ -114 +114 @@
   box->showAll();
 
+  OrxGui::GLGuiImage* image = new OrxGui::GLGuiImage();
+  image->show();
+  image->setWidgetSize(200, 200);
+  image->setAbsCoor2D(300, 300);
 
   OrxGui::GLGuiSlider* slider = new OrxGui::GLGuiSlider();