Changeset 7901 in orxonox.OLD

Timestamp:

May 27, 2006, 1:43:23 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: the CheckButton works

Location:

branches/gui/src

Files:

• lib/gui/gl_gui/Makefile.am (modified) (2 diffs)
• lib/gui/gl_gui/glgui.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_button.cc (modified) (2 diffs)
• lib/gui/gl_gui/glgui_button.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_checkbutton.cc (modified) (2 diffs)
• lib/gui/gl_gui/glgui_checkbutton.h (modified) (2 diffs)
• lib/gui/gl_gui/glgui_colorselector.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_pushbutton.cc (modified) (3 diffs)
• lib/gui/gl_gui/glgui_pushbutton.h (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (1 diff)

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

@@ -17 +17 @@
                 glgui_button.cc \
                 glgui_pushbutton.cc \
+                glgui_checkbutton.cc \
                 glgui_container.cc \
                 glgui_bar.cc \
@@ -36 +37 @@
                 glgui_button.h \
                 glgui_pushbutton.h \
+                glgui_checkbutton.h \
                 glgui_container.h \
                 glgui_bar.h \

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

@@ -15 +15 @@
 #include "glgui_button.h"
 #include "glgui_checkbutton.h"
-#include "glgui_colorselector.h"
+//#include "glgui_colorselector.h"
 #include "glgui_pushbutton.h"
 #include "glgui_cursor.h"

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

@@ -30 +30 @@
     this->init();
 
-    this->setLabel(label);
+    this->label.setText( label );
   }
 
@@ -64 +64 @@
   {
     this->label.setText(label);
-    this->label.setRelCoor2D(5, 5);
-    this->setSize2D(this->label.getSizeX2D() + 10, this->label.getSizeY2D() + 10);
-
+    this->resize();
   }
 
-
   /**
-   * draws the GLGuiButton
+   * @brief draws the GLGuiButton
    */
   void GLGuiButton::draw() const

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

@@ -39 +39 @@
     void setLabel(const std::string& label);
 
+    virtual void resize() = 0;
+
     virtual void draw() const;
 

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

@@ -27 +27 @@
    * standard constructor
   */
-  GLGuiCheckButton::GLGuiCheckButton ()
+  GLGuiCheckButton::GLGuiCheckButton (const std::string& label, bool active)
+  : GLGuiButton(label)
   {
     this->init();
+    this->bActive = active;
 
+    this->resize();
   }
 
@@ -44 +47 @@
    * initializes the GUI-element
    */
-  GLGuiCheckButton::init()
+  void GLGuiCheckButton::init()
   {
     this->setClassID(CL_GLGUI_CHECKBUTTON, "GLGuiCheckButton");
+  }
 
+
+  void GLGuiCheckButton::toggleActiveState()
+  {
+    this->bActive = !this->bActive;
+  }
+
+  void GLGuiCheckButton::resize()
+  {
+    this->label.setRelCoor2D(25, 5);
+    this->setSize2D(this->label.getSizeX2D() + 30, this->label.getSizeY2D() + 10);
+  }
+
+
+  void GLGuiCheckButton::released()
+  {
+    printf("%s released\n", this->getLabel().c_str());
+    GLGuiWidget::released();
+    this->toggleActiveState();
   }
 
   /**
-   * draws the GLGuiCheckButton
+   * @brief draws the GLGuiPushButton
    */
   void GLGuiCheckButton::draw() const
   {
+    this->startDraw();
+    GLGuiButton::draw();
+
+    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);
+
+    if (this->bActive)
+      glColor3f( 1, 1 ,1);
+    else
+      glColor3f(0, 0, 0);
+    glTexCoord2i(0,0); glVertex2d(8, 8);
+    glTexCoord2i(0,1); glVertex2d(8, this->getSizeY2D()-8);
+    glTexCoord2i(1,1); glVertex2d(this->getSizeY2D()-8, this->getSizeY2D()-8);
+    glTexCoord2i(1,0); glVertex2d(this->getSizeY2D()-8, 8);
+
+    glEnd();
+
+
+    this->endDraw();
+    //   this->label->draw();
+    //  printf("test");
   }
 }

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

@@ -6 +6 @@
 
 #ifndef _GLGUI_CHECKBUTTON_H
-#define _GLGUI__H
+#define _GLGUI_CHECKBUTTON_H
 
 #include "glgui_button.h"
@@ -23 +23 @@
 
   public:
-    GLGuiCheckButton();
+    GLGuiCheckButton(const std::string& label = "", bool active = false);
     virtual ~GLGuiCheckButton();
 
-    void init();
+    virtual void resize();
+    virtual void released();
 
     bool    isActive() { return this->bActive; };
     void    setActivity(bool bActive);
+    void    toggleActiveState();
 
     virtual void draw() const;
     virtual void update() {};
+
+  private:
+    void init();
+
 
   private:

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

@@ -5 +5 @@
  */
 
-#ifndef _GLGUI__H
-#define _GLGUI__H
+#ifndef _GLGUI_COLORSELECTOR_H
+#define _GLGUI_COLORSELECTOR_H
 
-#include "base_object.h"
+#include "glgui_widget.h"
 
 namespace OrxGui

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

@@ -28 +28 @@
    */
   GLGuiPushButton::GLGuiPushButton (const std::string& label)
-  :GLGuiButton(label)
+  : GLGuiButton(label)
   {
     this->init();
+
+    this->resize();
   }
 
@@ -39 +41 @@
   GLGuiPushButton::~GLGuiPushButton()
   {
+  }
+
+  void GLGuiPushButton::resize()
+  {
+    this->label.setRelCoor2D(5, 5);
+    this->setSize2D(this->label.getSizeX2D() + 10, this->label.getSizeY2D() + 10);
   }
 
@@ -78 +86 @@
 
   /**
-   * draws the GLGuiPushButton
+   * @brief draws the GLGuiPushButton
    */
   void GLGuiPushButton::draw() const

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

@@ -23 +23 @@
 
   public:
-    GLGuiPushButton(const std::string& label);
+    GLGuiPushButton(const std::string& label = "");
     virtual ~GLGuiPushButton();
 
+
+    virtual void resize();
 
     virtual void receivedFocus();

branches/gui/src/story_entities/simple_game_menu.cc

@@ -70 +70 @@
   pb->setAbsCoor2D(50, 50);
 
-  OrxGui::GLGuiPushButton* dnpb = new OrxGui::GLGuiPushButton("DO NOT PUSH ME");
+  OrxGui::GLGuiButton* dnpb = new OrxGui::GLGuiCheckButton("DO NOT PUSH ME");
   dnpb->show();
   dnpb->setAbsCoor2D(350, 50);