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

Timestamp:

Oct 15, 2005, 9:58:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: introducing the GLGuiMainWidget-class, that is the topmost of all widgets

Location:

trunk/src/lib/gui/gl_gui

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• glgui_mainwidget.cc (copied) (copied from trunk/src/proto/proto_singleton.cc) (3 diffs)
• glgui_mainwidget.h (copied) (copied from trunk/src/proto/proto_singleton.h) (1 diff)
• glgui_widget.cc (modified) (1 diff)
• glgui_widget.h (modified) (2 diffs)

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

@@ -11 +11 @@
 libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
                         glgui_handler.cc \
+                        glgui_mainwidget.cc \
                         glgui_widget.cc \
                         glgui_button.cc \
@@ -22 +23 @@
 noinst_HEADERS= glmenu/glmenu_imagescreen.h \
                 glgui.h \
+                glgui_handler.h \
+                glgui_mainwidget.h \
                 glgui_widget.h \
                 glgui_button.h \

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

@@ -56 +56 @@
 am_libORXglgui_a_OBJECTS = libORXglgui_a-glmenu_imagescreen.$(OBJEXT) \
         libORXglgui_a-glgui_handler.$(OBJEXT) \
+        libORXglgui_a-glgui_mainwidget.$(OBJEXT) \
         libORXglgui_a-glgui_widget.$(OBJEXT) \
         libORXglgui_a-glgui_button.$(OBJEXT) \
@@ -72 +73 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_frame.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_handler.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_widget.Po \
@@ -201 +203 @@
 libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
                         glgui_handler.cc \
+                        glgui_mainwidget.cc \
                         glgui_widget.cc \
                         glgui_button.cc \
@@ -211 +214 @@
 noinst_HEADERS = glmenu/glmenu_imagescreen.h \
                 glgui.h \
+                glgui_handler.h \
+                glgui_mainwidget.h \
                 glgui_widget.h \
                 glgui_button.h \
@@ -272 +277 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_frame.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_handler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_widget.Po@am__quote@
@@ -324 +330 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_handler.obj `if test -f 'glgui_handler.cc'; then $(CYGPATH_W) 'glgui_handler.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_handler.cc'; fi`
+
+libORXglgui_a-glgui_mainwidget.o: glgui_mainwidget.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_mainwidget.o -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Tpo" -c -o libORXglgui_a-glgui_mainwidget.o `test -f 'glgui_mainwidget.cc' || echo '$(srcdir)/'`glgui_mainwidget.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_mainwidget.cc' object='libORXglgui_a-glgui_mainwidget.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_mainwidget.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_mainwidget.o `test -f 'glgui_mainwidget.cc' || echo '$(srcdir)/'`glgui_mainwidget.cc
+
+libORXglgui_a-glgui_mainwidget.obj: glgui_mainwidget.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_mainwidget.obj -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Tpo" -c -o libORXglgui_a-glgui_mainwidget.obj `if test -f 'glgui_mainwidget.cc'; then $(CYGPATH_W) 'glgui_mainwidget.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_mainwidget.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_mainwidget.cc' object='libORXglgui_a-glgui_mainwidget.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_mainwidget.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_mainwidget.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_mainwidget.obj `if test -f 'glgui_mainwidget.cc'; then $(CYGPATH_W) 'glgui_mainwidget.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_mainwidget.cc'; fi`
 
 libORXglgui_a-glgui_widget.o: glgui_widget.cc

trunk/src/lib/gui/gl_gui/glgui_mainwidget.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
 
-#include "proto_singleton.h"
+#include "glgui_mainwidget.h"
 
 using namespace std;
@@ -24 +24 @@
  * standard constructor
  */
-ProtoSingleton::ProtoSingleton ()
+GLGuiMainWidget::GLGuiMainWidget()
 {
-   this->setClassID(CL_PROTO_ID, "ProtoSingleton");
-   this->setName("ProtoSingleton");
-
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
-   !!!!!!!!!! IMPORTANT FOR SINGLETON !!!!!!!!!!!!!!!!
-        3. SingleTon MUST be CL_NEW_CLASS = 0x00000fxx
-
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
+  this->setClassID(CL_GLGUI_MAIN_WIDGET, "GLGuiMainWidget");
+  this->setName("GLGuiMainWidget");
 }
 
@@ -46 +33 @@
  *  the singleton reference to this class
  */
-ProtoSingleton* ProtoSingleton::singletonRef = NULL;
+GLGuiMainWidget* GLGuiMainWidget::singletonRef = NULL;
 
 /**
-   @brief standard deconstructor
+ * standard deconstructor
  */
-ProtoSingleton::~ProtoSingleton ()
+GLGuiMainWidget::~GLGuiMainWidget ()
 {
-  ProtoSingleton::singletonRef = NULL;
+  GLGuiMainWidget::singletonRef = NULL;
 }

trunk/src/lib/gui/gl_gui/glgui_mainwidget.h

@@ -1 +1 @@
 /*!
- * @file proto_singleton.h
- * @brief Definition of the ... singleton Class
-*/
+ * @file glgui_mainwidget.h
+ * @brief Definition of the glGui singleton Class
+ */
 
-#ifndef _PROTO_SINGLETON_H
-#define _PROTO_SINGLETON_H
+#ifndef _GLGUI_MAINWIDGET_H
+#define _GLGUI_MAINWIDGET_H
 
-#include "base_object.h"
+#include "glgui_widget.h"
 
 // FORWARD DEFINITION
 
 //! A default singleton class.
-class ProtoSingleton : public BaseObject {
+class GLGuiMainWidget : public GLGuiWidget {
 
  public:
-  virtual ~ProtoSingleton(void);
+  virtual ~GLGuiMainWidget(void);
   /** @returns a Pointer to the only object of this Class */
-  inline static ProtoSingleton* getInstance(void) { if (!singletonRef) singletonRef = new ProtoSingleton();  return singletonRef; };
+  inline static GLGuiMainWidget* getInstance(void) { if (!GLGuiMainWidget::singletonRef) GLGuiMainWidget::singletonRef = new GLGuiMainWidget();  return GLGuiMainWidget::singletonRef; };
+
+  virtual void update() {};
+  virtual void draw() const {};
 
  private:
-  ProtoSingleton(void);
-  static ProtoSingleton* singletonRef;
+  GLGuiMainWidget(void);
+  static GLGuiMainWidget*       singletonRef;
 };
 
-#endif /* _PROTO_SINGLETON_H */
+#endif /* _GLGUI_MAINWIDGET_H */

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

@@ -23 +23 @@
  * standard constructor
 */
-GLGuiWidget::GLGuiWidget ()
+GLGuiWidget::GLGuiWidget ( ) : Element2D(NULL)
 {
   this->init();

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

@@ -13 +13 @@
 class Material;
 
-//! This is part of the openglGUI class
+//! This is widget part of the openglGUI class
 /**
 * A widget is the main class of all the elements of th GUI.
@@ -28 +28 @@
 
 
-    virtual void draw() = 0;
     virtual void update() = 0;