Changeset 5391 in orxonox.OLD for trunk/src

Timestamp:

Oct 16, 2005, 1:37:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more gui-definitions

Location:

trunk/src

Files:

• defs/functor_list.h (modified) (3 diffs)
• lib/coord/p_node.h (modified) (1 diff)
• lib/event/event.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_box.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_box.h (modified) (2 diffs)
• lib/gui/gl_gui/glgui_checkbutton.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_container.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_handler.cc (modified) (2 diffs)
• lib/gui/gl_gui/glgui_menu.h (modified) (2 diffs)
• lib/gui/gl_gui/glgui_widget.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.h (modified) (4 diffs)
• lib/shell/shell_command.h (modified) (1 diff)

trunk/src/defs/functor_list.h

@@ -9 +9 @@
    any later version.
    */
-
 
 /*!
@@ -105 +104 @@
 
 #ifdef FUNCTOR_LIST
+
   FUNCTOR_LIST(0)();
   //! makes functions with one string
@@ -152 +152 @@
   FUNCTOR_LIST(2)(l_UINT, l_LONG);
   FUNCTOR_LIST(2)(l_STRING, l_UINT);
+
+
 #endif /* FUNCTOR_LIST */

trunk/src/lib/coord/p_node.h

@@ -1 +1 @@
 /*!
-    @file p_node.h
-  *  Definition of a parenting node
-
-    parenting is how coordinates are handled in orxonox, meaning, that all coordinates
-    are representet relative to another parent node. this nodes build a parenting
-    tree of one-sided references (from up to down referenced).
-    Every node manages itself a list of childrens (of whos it is parent - easy...)
-
-    absCoordinate, absDirection have to be recalculated as soon as there was a change in
-    place or ortientation. this is only the case if
-    o bDirChanged is true (so changed) AND timeStamp != now
-    o bCoorChanged is true (so moved) AND timeStamp != now
-    this conditions make it cheaper to recalculate the tree (reduces redundant work).
-
-    remember: if you have to change the coordinates or the directions, use the functions
-    that are defined to execute this operation - otherwhise there will be big problems...
-*/
+ * @file p_node.h
+ * @brief  Definition of a parenting node
+ *
+ *  parenting is how coordinates are handled in orxonox, meaning, that all coordinates
+ *  are representet relative to another parent node. this nodes build a parenting
+ *  tree of one-sided references (from up to down referenced).
+ *  Every node manages itself a list of childrens (of whos it is parent - easy...).
+ *
+ *  absCoordinate, absDirection have to be recalculated as soon as there was a change in
+ *  place or ortientation. this is only the case if
+ *  o bDirChanged is true (so changed) AND timeStamp != now
+ *  o bCoorChanged is true (so moved) AND timeStamp != now
+ *  this conditions make it cheaper to recalculate the tree (reduces redundant work).
+ */
 
 

trunk/src/lib/event/event.h

@@ +1 @@
+/*
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004 orx
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+### File Specific:
+   main-programmer: Patrick Boenzli
+   co-programmer: ...
+
+   Benjamin Grauer: added SDL_ResizeEvent resize (for the GraphicsEngine)
+*/
+
 /*!
  * @file event.h

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

@@ -23 +23 @@
  * standard constructor
 */
-GLGuiBox::GLGuiBox ()
+GLGuiBox::GLGuiBox (GLGuiBoxType type)
 {
   this->init();
 
+  this->setType (type);
 }
 

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

@@ -12 +12 @@
 // FORWARD DECLARATION
 
+typedef enum
+{
+  GLGuiBox_H,
+  GLGuiBox_V,
+} GLGuiBoxType;
+
 //! This is BOX part of the openglGUI class
 /**
@@ -19 +25 @@
 
  public:
-  GLGuiBox();
+  GLGuiBox(GLGuiBoxType type = GLGuiBox_H);
   virtual ~GLGuiBox();
 
   void init();
+  void setType(GLGuiBoxType type) { this->type = type; };
 
   virtual void draw();
 
  private:
+   GLGuiBoxType         type;
 
 };

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

@@ -24 +24 @@
   void init();
 
+  bool    isActive() { return this->bActive; };
+  void    setActivity(bool bActive);
+
   virtual void draw();
 
  private:
+   bool             bActive;
 
 };

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

@@ -25 +25 @@
   void init();
 
+  void add(GLGuiWidget* widget);
+
+  void setBorderWidth(float borderwidth);
+
   void hideAll();
   void showAll();
+
 
   virtual void draw();

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

@@ -46 +46 @@
 void GLGuiHandler::activate()
 {
-//  EventHandler::getInstance()->setState(ES_MENU);
+  EventHandler::getInstance()->pushState(ES_MENU);
 
 }
@@ -52 +52 @@
 void GLGuiHandler::deactivate()
 {
+  EventHandler::getInstance()->popState();
 
 }

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

@@ -11 +11 @@
 
 // FORWARD DECLARATION
-
+template<class T>  class tList;
 //! This is Menu part of the openglGUI class
 /**
@@ -24 +24 @@
   void init();
 
+  void addItem(const char* itemName);
+  void removeItem(const char* itemName);
+  void removeItem(unsigned int itemNumber);
+  void selectItem(const char* itemName);
+  void selectItem(unsigned int itemNumber);
+
   virtual void draw();
 
  private:
+   tList<char>*           itemList;
 
 };

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

@@ -39 +39 @@
 
 
+bool GLGuiWidget::focusOverWidget(float x, float y)
+{
+  if (this->getAbsCoor2D().x < x && this->getAbsCoor2D().x+ this->getSizeX2D() > x &&
+      this->getAbsCoor2D().y < y && this->getAbsCoor2D().y+ this->getSizeX2D() > y)
+    return true;
+  else
+    return false;
+}
+
+
 /**
  * initializes the GUI-element

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

@@ -1 +1 @@
 /*!
-* @file glgui_widget.h
-* The gl_widget of the openglGUI
-*/
+ * @file glgui_widget.h
+ * The gl_widget of the openglGUI
+ */
 
 #ifndef _GLGUI_WIDGET_H
@@ -9 +9 @@
 #include "element_2d.h"
 #include "glincl.h"
+#include "event.h"
 
 // FORWARD DECLARATION
 class Material;
+class Signal; //!< @todo create this!!
+
+typedef enum
+{
+  GLGuiSignal_click     = 0,
+  GLGuiSignal_release   = 1,
+  GLGuiSignal_rollOn    = 2,
+  GLGuiSignal_rollOff   = 3,
+  GLGuiSignal_open      = 4,
+  GLGuiSignal_close     = 5,
+  GLGuiSignal_destroy   = 6,
+
+  GLGuiSignalCount      = 7,
+} GLGuiSignalType;
 
 //! if the Element should be visible by default.
@@ -30 +45 @@
     void hide();
 
+    void connectSignal(GLGuiSignalType signalType, Signal* signal);
+    void disconnectSignal(GLGuiSignalType);
+    bool focusOverWidget(float x, float y);
+
+    // if something was clickt on the GUI-widget.
+    virtual void click(const Event& event) {};
+    virtual void release(const Event& event) {};
+
+    virtual void receiveFocus() {};
+    virtual void removeFocus() {};
 
     virtual void update() = 0;
@@ -40 +65 @@
     GLuint                frontModel;
 
+    Signal*               widgetSignals[GLGuiSignalCount];
+
   private:
     bool                  focusable;        //!< If this widget can receive focus.

trunk/src/lib/shell/shell_command.h

@@ -2 +2 @@
  * @file shell_command.h
  * Definition of a on-screen-shell
- *
- * @todo also take Static functions
-*/
+ */
 
 #ifndef _SHELL_COMMAND_H