Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Oct 11, 2005, 10:13:55 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: sync

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

Legend:

Unmodified
Added
Removed

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

    r5362 r5363  
    1010
    1111libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
    12                         glgui_widget.cc
     12                        glgui_widget.cc \
     13                        glgui_button.cc
    1314
    1415noinst_HEADERS= glmenu/glmenu_imagescreen.h \
    1516                glgui.h \
    16                 glgui_widget.h
     17                glgui_widget.h \
     18                glgui_button.h
     19
    1720
    1821

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

    r5362 r5363  
    5555libORXglgui_a_LIBADD =
    5656am_libORXglgui_a_OBJECTS = libORXglgui_a-glmenu_imagescreen.$(OBJEXT) \
    57         libORXglgui_a-glgui_widget.$(OBJEXT)
     57        libORXglgui_a-glgui_widget.$(OBJEXT) \
     58        libORXglgui_a-glgui_button.$(OBJEXT)
    5859libORXglgui_a_OBJECTS = $(am_libORXglgui_a_OBJECTS)
    5960DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6061depcomp = $(SHELL) $(top_srcdir)/depcomp
    6162am__depfiles_maybe = depfiles
    62 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libORXglgui_a-glgui_widget.Po \
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libORXglgui_a-glgui_button.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_widget.Po \
    6365@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po
    6466CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    … …  
    186188libORXglgui_a_CPPFLAGS = -DBUILD_ORXONOX
    187189libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
    188                         glgui_widget.cc
     190                        glgui_widget.cc \
     191                        glgui_button.cc
    189192
    190193noinst_HEADERS = glmenu/glmenu_imagescreen.h \
    191194                glgui.h \
    192                 glgui_widget.h
     195                glgui_widget.h \
     196                glgui_button.h
    193197
    194198EXTRA_DIST =
    … …  
    240244        -rm -f *.tab.c
    241245
     246@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_button.Po@am__quote@
    242247@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_widget.Po@am__quote@
    243248@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po@am__quote@
    … …  
    290295@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    291296@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_widget.obj `if test -f 'glgui_widget.cc'; then $(CYGPATH_W) 'glgui_widget.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_widget.cc'; fi`
     297
     298libORXglgui_a-glgui_button.o: glgui_button.cc
     299@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_button.o -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_button.Tpo" -c -o libORXglgui_a-glgui_button.o `test -f 'glgui_button.cc' || echo '$(srcdir)/'`glgui_button.cc; \
     300@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_button.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_button.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_button.Tpo"; exit 1; fi
     301@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_button.cc' object='libORXglgui_a-glgui_button.o' libtool=no @AMDEPBACKSLASH@
     302@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_button.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_button.TPo' @AMDEPBACKSLASH@
     303@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     304@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_button.o `test -f 'glgui_button.cc' || echo '$(srcdir)/'`glgui_button.cc
     305
     306libORXglgui_a-glgui_button.obj: glgui_button.cc
     307@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_button.obj -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_button.Tpo" -c -o libORXglgui_a-glgui_button.obj `if test -f 'glgui_button.cc'; then $(CYGPATH_W) 'glgui_button.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_button.cc'; fi`; \
     308@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_button.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_button.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_button.Tpo"; exit 1; fi
     309@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_button.cc' object='libORXglgui_a-glgui_button.obj' libtool=no @AMDEPBACKSLASH@
     310@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_button.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_button.TPo' @AMDEPBACKSLASH@
     311@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     312@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_button.obj `if test -f 'glgui_button.cc'; then $(CYGPATH_W) 'glgui_button.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_button.cc'; fi`
    292313uninstall-info-am:
    293314

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

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

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

    r5360 r5363  
    11/*!
    2  * @file glgui_.h
    3  * The gl_ widget of th openglGUI
     2 * @file glgui_button.h
     3 * The gl_BUTTON widget of th openglGUI
    44 *
    55 */
    66
    7 #ifndef _GLGUI__H
    8 #define _GLGUI__H
     7#ifndef _GLGUI_BUTTON_H
     8#define _GLGUI_BUTTON_H
    99
    10 #include "base_object.h"
     10#include "glgui_widget.h"
     11
     12typedef enum
     13{
     14  GLGui_Button_Active,
     15  GLGui_Button_Inactive,
     16  GLGui_Button_Pressed,
     17  GLGui_Button_Released,
     18  GLGui_Button_Activating,
     19  GLGui_Button_Deactivating,
     20
     21} GLGui_ButtonState;
    1122
    1223// FORWARD DECLARATION
    … …  
    1627 *
    1728 */
    18 class GLGui : public GLGui {
     29class GLGuiButton : public GLGuiWidget {
    1930
    2031 public:
    21   GLGui();
    22   virtual ~GLGui();
     32  GLGuiButton();
     33  virtual ~GLGuiButton();
    2334
    2435  void init();
    … …  
    2738
    2839 private:
     40  char*                text;
     41  GLGui_ButtonState    state;
    2942
    3043};

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

    r5362 r5363  
    4747
    4848}
    49 
    50 
    51 /**
    52  * draws the GLGuiWidget
    53  */
    54 void GLGuiWidget::draw()
    55 {
    56 
    57 }
    58 
    59 /**
    60  * updates a GLGuiWidget
    61  */
    62 void GLGuiWidget::update()
    63 {
    64 
    65 }

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

    r5362 r5363  
    2323  void init();
    2424
    25   virtual void draw();
    26   virtual void update();
    27 
     25  virtual void draw() = 0;
     26  virtual void update() = 0;
    2827
    2928 private:
Note: See TracChangeset for help on using the changeset viewer.