Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5406 in orxonox.OLD for trunk/src/lib/gui


Ignore:
Timestamp:
Oct 19, 2005, 6:30:07 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: update the Element2D-tree in the right order

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

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/gui/gl_gui/Makefile.am

    r5384 r5406  
    1010
    1111libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
    12                         glgui_handler.cc \
    13                         glgui_mainwidget.cc \
     12                        glgui_handler.cc \
     13                        glgui_mainwidget.cc \
    1414                        glgui_widget.cc \
    1515                        glgui_button.cc \

  • trunk/src/lib/gui/gl_gui/Makefile.in

    r5384 r5406  
    202202libORXglgui_a_CPPFLAGS = -DBUILD_ORXONOX
    203203libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
    204                         glgui_handler.cc \
    205                         glgui_mainwidget.cc \
     204                        glgui_handler.cc \
     205                        glgui_mainwidget.cc \
    206206                        glgui_widget.cc \
    207207                        glgui_button.cc \

  • trunk/src/lib/gui/gl_gui/glgui_handler.cc

    r5401 r5406  
    1818#include "glgui_handler.h"
    1919#include "event_handler.h"
     20
     21#include "glgui_mainwidget.h"
    2022
    2123using namespace std;
    … …  
    6365
    6466}
     67
     68void GLGuiHandler::draw()
     69{
     70  GLGuiMainWidget::getInstance()->draw2D(E2D_LAYER_TOP);
     71}
     72
     73
     74void GLGuiHandler::tick(float dt)
     75{
     76
     77}

  • trunk/src/lib/gui/gl_gui/glgui_handler.h

    r5405 r5406  
    1717  virtual ~GLGuiHandler(void);
    1818  /** @returns a Pointer to the only object of this Class */
    19   inline static GLGuiHandler* getInstance(void) { if (!singletonRef) singletonRef = new GLGuiHandler();  return singletonRef; };
     19  inline static GLGuiHandler* getInstance(void) { if (!GLGuiHandler::singletonRef) GLGuiHandler::singletonRef = new GLGuiHandler();  return GLGuiHandler::singletonRef; };
    2020
    2121  void activate();
    … …  
    2424
    2525  virtual void process(const Event &event);
     26  void draw();
     27  void tick(float dt);
    2628
    2729 private:

  • trunk/src/lib/gui/gl_gui/glgui_widget.cc

    r5404 r5406  
    5050  this->clickable = true;
    5151  this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
    52   this->setParent2D((Element2D*)NULL);
     52//  this->setParent2D((Element2D*)NULL);
    5353
    5454  this->backMat = NULL;
Note: See TracChangeset for help on using the changeset viewer.