Changeset 5362 in orxonox.OLD for trunk/src/lib/gui/gl_gui
- Timestamp:
- Oct 11, 2005, 1:36:08 AM (19 years ago)
- Location:
- trunk/src/lib/gui/gl_gui
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/gui/gl_gui/Makefile.am
r5315 r5362 2 2 include $(MAINSRCDIR)/defs/include_paths.am 3 3 4 AM_LDFLAGS = 4 AM_LDFLAGS = 5 5 6 noinst_LIBRARIES = libORXglgui.a 6 noinst_LIBRARIES = libORXglgui.a 7 7 8 8 libORXglgui_a_CPPFLAGS = -DBUILD_ORXONOX 9 9 10 10 11 libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc 11 libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \ 12 glgui_widget.cc 12 13 13 noinst_HEADERS= glmenu/glmenu_imagescreen.h 14 noinst_HEADERS= glmenu/glmenu_imagescreen.h \ 15 glgui.h \ 16 glgui_widget.h 14 17 15 18 16 EXTRA_DIST = 19 EXTRA_DIST = 17 20 -
trunk/src/lib/gui/gl_gui/Makefile.in
r5351 r5362 54 54 libORXglgui_a_AR = $(AR) $(ARFLAGS) 55 55 libORXglgui_a_LIBADD = 56 am_libORXglgui_a_OBJECTS = libORXglgui_a-glmenu_imagescreen.$(OBJEXT) 56 am_libORXglgui_a_OBJECTS = libORXglgui_a-glmenu_imagescreen.$(OBJEXT) \ 57 libORXglgui_a-glgui_widget.$(OBJEXT) 57 58 libORXglgui_a_OBJECTS = $(am_libORXglgui_a_OBJECTS) 58 59 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 59 60 depcomp = $(SHELL) $(top_srcdir)/depcomp 60 61 am__depfiles_maybe = depfiles 61 @AMDEP_TRUE@DEP_FILES = \62 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libORXglgui_a-glgui_widget.Po \ 62 63 @AMDEP_TRUE@ ./$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po 63 64 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ … … 182 183 MAINSRCDIR = ../../.. 183 184 AM_LDFLAGS = 184 noinst_LIBRARIES = libORXglgui.a 185 noinst_LIBRARIES = libORXglgui.a 185 186 libORXglgui_a_CPPFLAGS = -DBUILD_ORXONOX 186 libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc 187 noinst_HEADERS = glmenu/glmenu_imagescreen.h 187 libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \ 188 glgui_widget.cc 189 190 noinst_HEADERS = glmenu/glmenu_imagescreen.h \ 191 glgui.h \ 192 glgui_widget.h 193 188 194 EXTRA_DIST = 189 195 all: all-am … … 234 240 -rm -f *.tab.c 235 241 242 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_widget.Po@am__quote@ 236 243 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po@am__quote@ 237 244 … … 267 274 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 268 275 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glmenu_imagescreen.obj `if test -f 'glmenu/glmenu_imagescreen.cc'; then $(CYGPATH_W) 'glmenu/glmenu_imagescreen.cc'; else $(CYGPATH_W) '$(srcdir)/glmenu/glmenu_imagescreen.cc'; fi` 276 277 libORXglgui_a-glgui_widget.o: glgui_widget.cc 278 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_widget.o -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_widget.Tpo" -c -o libORXglgui_a-glgui_widget.o `test -f 'glgui_widget.cc' || echo '$(srcdir)/'`glgui_widget.cc; \ 279 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libORXglgui_a-glgui_widget.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_widget.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_widget.Tpo"; exit 1; fi 280 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='glgui_widget.cc' object='libORXglgui_a-glgui_widget.o' libtool=no @AMDEPBACKSLASH@ 281 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libORXglgui_a-glgui_widget.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_widget.TPo' @AMDEPBACKSLASH@ 282 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 283 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_widget.o `test -f 'glgui_widget.cc' || echo '$(srcdir)/'`glgui_widget.cc 284 285 libORXglgui_a-glgui_widget.obj: glgui_widget.cc 286 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_widget.obj -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_widget.Tpo" -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`; \ 287 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libORXglgui_a-glgui_widget.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_widget.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_widget.Tpo"; exit 1; fi 288 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='glgui_widget.cc' object='libORXglgui_a-glgui_widget.obj' libtool=no @AMDEPBACKSLASH@ 289 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libORXglgui_a-glgui_widget.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_widget.TPo' @AMDEPBACKSLASH@ 290 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 291 @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` 269 292 uninstall-info-am: 270 293 -
trunk/src/lib/gui/gl_gui/glgui_widget.cc
r5359 r5362 16 16 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI 17 17 18 #include "glgui_ .h"18 #include "glgui_widget.h" 19 19 20 20 using namespace std; … … 23 23 * standard constructor 24 24 */ 25 GLGui ::GLGui()25 GLGuiWidget::GLGuiWidget () 26 26 { 27 27 this->init(); … … 33 33 * standard deconstructor 34 34 */ 35 GLGui::~GLGui() 35 GLGuiWidget::~GLGuiWidget() 36 { 37 38 } 39 40 41 /** 42 * initializes the GUI-element 43 */ 44 void GLGuiWidget::init() 45 { 46 this->setClassID(CL_GLGUI_WIDGET, "GLGuiWidget"); 47 48 } 49 50 51 /** 52 * draws the GLGuiWidget 53 */ 54 void GLGuiWidget::draw() 36 55 { 37 56 … … 39 58 40 59 /** 41 * initializes the GUI-element60 * updates a GLGuiWidget 42 61 */ 43 GLGui::init() 44 { 45 this->setClassID(CL_GLGUI_, "GLGui"); 46 47 } 48 49 /** 50 * draws the GLGui 51 */ 52 void GLGui::draw() 62 void GLGuiWidget::update() 53 63 { 54 64 -
trunk/src/lib/gui/gl_gui/glgui_widget.h
r5359 r5362 1 1 /*! 2 * @file glgui_.h 3 * The gl_ widget of th openglGUI 4 * 2 * @file glgui_widget.h 3 * The gl_widget of the openglGUI 5 4 */ 6 5 7 #ifndef _GLGUI_ _H8 #define _GLGUI_ _H6 #ifndef _GLGUI_WIDGET_H 7 #define _GLGUI_WIDGET_H 9 8 10 #include " base_object.h"9 #include "element_2d.h" 11 10 12 11 // FORWARD DECLARATION … … 14 13 //! This is part of the openglGUI class 15 14 /** 16 * 15 * A widget is the main class of all the elements of th GUI. 17 16 */ 18 class GLGui : public GLGui{17 class GLGuiWidget : public Element2D { 19 18 20 19 public: 21 GLGui ();22 virtual ~GLGui ();20 GLGuiWidget(); 21 virtual ~GLGuiWidget(); 23 22 24 23 void init(); 25 24 26 25 virtual void draw(); 26 virtual void update(); 27 27 28 28 29 private: … … 30 31 }; 31 32 32 #endif /* _GLGUI_ _H */33 #endif /* _GLGUI_WIDGET_H */
Note: See TracChangeset
for help on using the changeset viewer.