Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5365 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Oct 11, 2005, 11:52:55 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: more-gui-definition

Location:
trunk/src/lib/gui/gl_gui
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/gui/gl_gui/glgui_bar.cc

    r5360 r5365  
    2323 * standard constructor
    2424*/
    25 GLGui::GLGui ()
     25GLGuiBar::GLGuiBar ()
    2626{
    2727  this->init();
     
    3333 * standard deconstructor
    3434*/
    35 GLGui::~GLGui()
     35GLGuiBar::~GLGuiBar()
    3636{
    3737
     
    4141 * initializes the GUI-element
    4242 */
    43 GLGui::init()
     43GLGuiBar::init()
    4444{
    45   this->setClassID(CL_GLGUI_, "GLGui");
     45  this->setClassID(CL_GLGUI_BAR, "GLGuiBar");
    4646
    4747}
    4848
    4949/**
    50  * draws the GLGui
     50 * draws the GLGuiBar
    5151 */
    52 void GLGui::draw()
     52void GLGuiBar::draw()
    5353{
    5454
  • trunk/src/lib/gui/gl_gui/glgui_bar.h

    r5360 r5365  
    11/*!
    2  * @file glgui_.h
     2 * @file glgui_bar.h
    33 * The gl_ widget of th openglGUI
    44 *
    55 */
    66
    7 #ifndef _GLGUI__H
    8 #define _GLGUI__H
     7#ifndef _GLGUI_BAR_H
     8#define _GLGUI_BAR_H
    99
    10 #include "base_object.h"
     10#include "glgui_widget.h"
    1111
    1212// FORWARD DECLARATION
    1313
    14 //! This is part of the openglGUI class
     14//! This is Bar part of the openglGUI class
    1515/**
    1616 *
    1717 */
    18 class GLGui : public GLGui {
     18class GLGuiBar : public GLGuiWidget {
    1919
    2020 public:
    21   GLGui();
    22   virtual ~GLGui();
     21  GLGuiBar();
     22  virtual ~GLGuiBar();
    2323
    2424  void init();
  • trunk/src/lib/gui/gl_gui/glgui_slider.cc

    r5360 r5365  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
    1717
    18 #include "glgui_.h"
     18#include "glgui_slider.h"
    1919
    2020using namespace std;
     
    2323 * standard constructor
    2424*/
    25 GLGui::GLGui ()
     25GLGuiSlider::GLGuiSlider ()
    2626{
    2727  this->init();
     
    3333 * standard deconstructor
    3434*/
    35 GLGui::~GLGui()
     35GLGuiSlider::~GLGuiSlider()
    3636{
    3737
     
    4141 * initializes the GUI-element
    4242 */
    43 GLGui::init()
     43void GLGuiSlider::init()
    4444{
    45   this->setClassID(CL_GLGUI_, "GLGui");
     45  this->setClassID(CL_GLGUI_SLIDER, "GLGuiSlider");
    4646
    4747}
    4848
    4949/**
    50  * draws the GLGui
     50 * draws the GLGuiSlider
    5151 */
    52 void GLGui::draw()
     52void GLGuiSlider::draw()
    5353{
    5454
  • trunk/src/lib/gui/gl_gui/glgui_slider.h

    r5360 r5365  
    11/*!
    2  * @file glgui_.h
     2 * @file glgui_slider.h
    33 * The gl_ widget of th openglGUI
    44 *
    55 */
    66
    7 #ifndef _GLGUI__H
    8 #define _GLGUI__H
     7#ifndef _GLGUI_SLIDER_H
     8#define _GLGUI_SLIDER_H
    99
    1010#include "base_object.h"
     
    1616 *
    1717 */
    18 class GLGui : public GLGui {
     18class GLGuiSlider : public GLGuiSlider {
    1919
    2020 public:
    21   GLGui();
    22   virtual ~GLGui();
     21  GLGuiSlider();
     22  virtual ~GLGuiSlider();
    2323
    2424  void init();
     
    3030};
    3131
    32 #endif /* _GLGUI__H */
     32#endif /* _GLGUI_SLIDER_H */
  • trunk/src/lib/gui/gl_gui/glgui_text.cc

    r5360 r5365  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
    1717
    18 #include "glgui_.h"
     18#include "glgui_text.h"
     19
     20#include "text.h"
    1921
    2022using namespace std;
     
    2325 * standard constructor
    2426*/
    25 GLGui::GLGui ()
     27GLGuiText::GLGuiText ()
    2628{
    2729  this->init();
     
    3335 * standard deconstructor
    3436*/
    35 GLGui::~GLGui()
     37GLGuiText::~GLGuiText()
    3638{
    3739
     
    4143 * initializes the GUI-element
    4244 */
    43 GLGui::init()
     45void GLGuiText::init()
    4446{
    45   this->setClassID(CL_GLGUI_, "GLGui");
     47  this->setClassID(CL_GLGUI_, "GLGuiText");
    4648
    4749}
    4850
    4951/**
    50  * draws the GLGui
     52 * draws the GLGuiText
    5153 */
    52 void GLGui::draw()
     54void GLGuiText::draw()
    5355{
    5456
  • trunk/src/lib/gui/gl_gui/glgui_text.h

    r5360 r5365  
    11/*!
    2  * @file glgui_.h
    3  * The gl_ widget of th openglGUI
     2 * @file glgui_text.h
     3 * The gl_TEXT widget of th openglGUI
    44 *
    55 */
    66
    7 #ifndef _GLGUI__H
    8 #define _GLGUI__H
     7#ifndef _GLGUI_TEXT_H
     8#define _GLGUI_TEXT_H
    99
    10 #include "base_object.h"
     10#include "glgui_widget.h"
    1111
    1212// FORWARD DECLARATION
     13class Text;
    1314
    1415//! This is part of the openglGUI class
     
    1617 *
    1718 */
    18 class GLGui : public GLGui {
     19class GLGuiText : public GLWidget {
    1920
    2021 public:
    21   GLGui();
    22   virtual ~GLGui();
     22  GLGuiText();
     23  virtual ~GLGuiText();
    2324
    2425  void init();
     
    2728
    2829 private:
    29 
     30  Text*             text;
    3031};
    3132
    32 #endif /* _GLGUI__H */
     33#endif /* _GLGUI_TEXT_H */
  • trunk/src/lib/gui/gl_gui/glgui_textfield.cc

    r5360 r5365  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
    1717
    18 #include "glgui_.h"
     18#include "glgui_textfield_.h"
    1919
    2020using namespace std;
     
    2323 * standard constructor
    2424*/
    25 GLGui::GLGui ()
     25GLGuiTextfield::GLGuiTextfield ()
    2626{
    2727  this->init();
     
    3333 * standard deconstructor
    3434*/
    35 GLGui::~GLGui()
     35GLGuiTextfield::~GLGuiTextfield()
    3636{
    3737
     
    4141 * initializes the GUI-element
    4242 */
    43 GLGui::init()
     43void GLGuiTextfield::init()
    4444{
    45   this->setClassID(CL_GLGUI_, "GLGui");
     45  this->setClassID(CL_GLGUI_, "GLGuiTextfield");
    4646
    4747}
    4848
    4949/**
    50  * draws the GLGui
     50 * draws the GLGuiTextfield
    5151 */
    52 void GLGui::draw()
     52void GLGuiTextfield::draw()
    5353{
    5454
  • trunk/src/lib/gui/gl_gui/glgui_textfield.h

    r5360 r5365  
    11/*!
    2  * @file glgui_.h
     2 * @file glgui_textfield.h
    33 * The gl_ widget of th openglGUI
    44 *
    55 */
    66
    7 #ifndef _GLGUI__H
    8 #define _GLGUI__H
     7#ifndef _GLGUI_TEXTFIELD_H
     8#define _GLGUI_TEXTFIELD_H
    99
    10 #include "base_object.h"
     10#include "glgui_widget.h"
    1111
    1212// FORWARD DECLARATION
     13class Text;
     14template<class T> class tList;
    1315
    1416//! This is part of the openglGUI class
     
    1618 *
    1719 */
    18 class GLGui : public GLGui {
     20class GLGuiTextfield : public GLGuiWidget {
    1921
    2022 public:
    21   GLGui();
    22   virtual ~GLGui();
     23  GLGuiTextfield();
     24  virtual ~GLGuiTextfield();
    2325
    2426  void init();
     
    2729
    2830 private:
     31  tList<Text>*      textLines;
    2932
    3033};
  • trunk/src/lib/gui/gl_gui/glgui_widget.h

    r5364 r5365  
    88
    99#include "element_2d.h"
     10#include "glincl.h"
    1011
    1112// FORWARD DECLARATION
     13class Material;
    1214
    1315//! This is part of the openglGUI class
     
    1618 */
    1719class GLGuiWidget : public Element2D {
    18 
    1920 public:
    2021  GLGuiWidget();
     
    3132
    3233 private:
     34  bool                  managed;          //!< if this GUI-element should be managed. true means it gets deleted with the deletion of it's parent.
     35  bool                  focusable;        //!< If it can receive focus.
     36  bool                  clickable;        //!< if it can be clicked upon.
     37
     38  Material*             backGround;
     39  GLuint                renderModel;
     40
     41
    3342
    3443};
Note: See TracChangeset for help on using the changeset viewer.