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

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:

trunk/src/lib/gui/gl

Files:

• Makefile.am (modified) (4 diffs)
• glgui.h (modified) (1 diff)
• glgui_box.cc (modified) (9 diffs)
• glgui_box.h (modified) (3 diffs)
• glgui_container.cc (modified) (1 diff)
• glgui_container.h (modified) (1 diff)
• glgui_defs.h (modified) (3 diffs)
• glgui_fixedposition_box.cc (copied) (copied from branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc)
• glgui_fixedposition_box.h (copied) (copied from branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.h)
• glgui_handler.cc (modified) (5 diffs)
• glgui_handler.h (modified) (5 diffs)
• glgui_text.cc (modified) (2 diffs)
• glgui_text.h (modified) (1 diff)
• glgui_widget.cc (modified) (4 diffs)
• glgui_widget.h (modified) (3 diffs)

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

@@ -13 +13 @@
                 \
                 glgui_handler.cc \
+                glgui_widget.cc \
                 glgui_mainwidget.cc \
-                glgui_widget.cc \
                 glgui_button.cc \
                 glgui_pushbutton.cc \
@@ -22 +22 @@
                 glgui_bar.cc \
                 glgui_box.cc \
+                glgui_fixedposition_box.cc \
                 glgui_frame.cc \
                 glgui_text.cc \
@@ -40 +41 @@
                 glgui_defs.h \
                 glgui_handler.h \
+                glgui_widget.h \
                 glgui_mainwidget.h \
-                glgui_widget.h \
                 glgui_button.h \
                 glgui_pushbutton.h \
@@ -49 +50 @@
                 glgui_bar.h \
                 glgui_box.h \
+                glgui_fixedposition_box.h \
                 glgui_frame.h \
                 glgui_text.h \

trunk/src/lib/gui/gl/glgui.h

@@ -14 +14 @@
 #include "glgui_bar.h"
 #include "glgui_box.h"
+#include "glgui_fixedposition_box.h"
 #include "glgui_button.h"
 #include "glgui_checkbutton.h"

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

@@ -18 +18 @@
 #include "glgui_box.h"
 #include <cassert>
+#include "debug.h"
 
 namespace OrxGui
@@ -36 +37 @@
   */
   GLGuiBox::~GLGuiBox()
-  {}
+  {
+    // unpack all the widgets.
+    while(!this->_children.empty())
+    {
+      /// not deleting children here.
+      this->_children.front()->setParentWidget(NULL);
+      this->_children.pop_front();
+    }
+  }
 
   /**
@@ -49 +58 @@
   {
     assert (widget != NULL);
-
-    this->children.push_back(widget);
+    this->_children.push_back(widget);
+
+    this->packing(widget);
+  }
+
+
+  void GLGuiBox::pack(GLGuiWidget* widget, std::list<GLGuiWidget*>::iterator pos)
+  {
+    this->_children.insert(pos, widget);
+    this->packing(widget);
+  }
+
+  void GLGuiBox::pack(GLGuiWidget* widget, unsigned int position)
+  {
+    if (this->_children.empty())
+      this->pack(widget);
+
+    unsigned int pos = 0;
+    std::list<GLGuiWidget*>::iterator it = this->_children.begin();
+
+    for (; pos < position; ++pos)
+    {
+      if (this->_children.end() == ++it)
+      {
+        PRINTF(2)("Reached end of packing list, without getting to the designated position %d (i am at %d)\n", position, pos);
+        this->pack(widget);
+      }
+    }
+    this->_children.insert(it, widget);
+    this->packing(widget);
+  }
+
+  void GLGuiBox::pack(GLGuiWidget* widget, const GLGuiWidget* widgetPointer)
+  {
+    assert (widget != NULL && widgetPointer != NULL);
+
+    std::list<GLGuiWidget*>::iterator it = this->_children.begin();
+    for (; it != this->_children.end(); ++it)
+    {
+      if (widgetPointer == *it)
+      {
+        this->_children.insert(it, widget);
+        this->packing(widget);
+        return;
+      }
+    }
+    PRINTF(2)("WidgetPointer %p not found, inserting at the end\n", widgetPointer);
+    this->pack(widget);
+  }
+
+  void GLGuiBox::packFront(GLGuiWidget* widget)
+  {
+    this->_children.push_front(widget);
+    this->packing(widget);
+  }
+
+  void GLGuiBox::packBack(GLGuiWidget* widget)
+  {
+    this->pack(widget);
+  }
+
+  void GLGuiBox::packing(GLGuiWidget* widget)
+  {
     widget->setParentWidget(this);
-
     this->resize();
   }
 
-
   void GLGuiBox::unpack(GLGuiWidget* widget)
   {
     assert(widget != NULL);
 
-    std::vector<GLGuiWidget*>::iterator delWidget = std::find(this->children.begin(), this->children.end(), widget);
-    if (delWidget != this->children.end())
+    std::list<GLGuiWidget*>::iterator delWidget = std::find(this->_children.begin(), this->_children.end(), widget);
+    if (delWidget != this->_children.end())
     {
       (*delWidget)->setParentWidget(NULL);
-      this->children.erase(delWidget);
+      this->_children.erase(delWidget);
     }
     this->resize();
@@ -72 +140 @@
   void GLGuiBox::clear()
   {
-    this->children.clear();
+    this->_children.clear();
     this->resize();
   }
@@ -78 +146 @@
   void GLGuiBox::showAll()
   {
-    std::vector<GLGuiWidget*>::iterator itC = this->children.begin();
-    while (itC != this->children.end())
+    std::list<GLGuiWidget*>::iterator itC = this->_children.begin();
+    while (itC != this->_children.end())
     {
       if ((*itC)->isA(CL_GLGUI_CONTAINER))
@@ -93 +161 @@
   void GLGuiBox::hideAll()
   {
-    std::vector<GLGuiWidget*>::iterator itC = this->children.begin();
-    while (itC != this->children.end())
+    std::list<GLGuiWidget*>::iterator itC = this->_children.begin();
+    while (itC != this->_children.end())
     {
       if ((*itC)->isA(CL_GLGUI_CONTAINER))
@@ -112 +180 @@
       float height = borderTop();
       float width = 0.0f;
-      std::vector<GLGuiWidget*>::iterator widget;
+      std::list<GLGuiWidget*>::iterator widget;
 
       // find out how big the Widgets are.
-      for (widget = this->children.begin(); widget != this->children.end(); ++widget)
+      for (widget = this->_children.begin(); widget != this->_children.end(); ++widget)
       {
         (*widget)->setRelCoor2D(borderLeft(), height);
@@ -131 +199 @@
       float height = borderTop();
       float width = borderLeft();
-      std::vector<GLGuiWidget*>::iterator widget;
+      std::list<GLGuiWidget*>::iterator widget;
 
       // find out how big the Widgets are.
-      for (widget = this->children.begin(); widget != this->children.end(); ++widget)
+      for (widget = this->_children.begin(); widget != this->_children.end(); ++widget)
       {
         (*widget)->setRelCoor2D(width, borderTop());
@@ -149 +217 @@
 
     // resize everything.
-    //for (widget = this->children.begin(); widget != this->children.end(); ++widget)
+    //for (widget = this->_children.begin(); widget != this->_children.end(); ++widget)
     //{}
   }

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

@@ -1 +1 @@
 /*!
- * @file glgui_.h
+ * @file glgui_box.h
  * The gl_box widget of th openglGUI
  *
@@ -30 +30 @@
 
     virtual void pack(GLGuiWidget* widget);
+    void pack(GLGuiWidget* widget, unsigned int position);
+    void pack(GLGuiWidget* widget, const GLGuiWidget* widgetPointer);
+    void packFront(GLGuiWidget* widget);
+    void packBack(GLGuiWidget* widget);
     virtual void unpack(GLGuiWidget* widget);
+
     virtual void clear();
 
@@ -43 +48 @@
   private:
     void init();
+    void packing(GLGuiWidget* widget); // the action executing when packing a widget.
+    void pack(GLGuiWidget* widget, std::list<GLGuiWidget*>::iterator pos);
+
+  private:
+
 
     Orientation                _orientation;
-    std::vector<GLGuiWidget*>  children;
+    std::list<GLGuiWidget*>    _children;
   };
 }

trunk/src/lib/gui/gl/glgui_container.cc

@@ -48 +48 @@
 
 
+  void GLGuiContainer::removeChildWidget(GLGuiWidget* widget)
+  {
+    this->unpack(widget);
+  }
+
+
   /**
    * draws the GLGuiContainer

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

@@ -38 +38 @@
     virtual void draw();
 
+  protected:
+    virtual void removeChildWidget(GLGuiWidget* widget);
+
   private:
     void init();

trunk/src/lib/gui/gl/glgui_defs.h

@@ -23 +23 @@
 
   //! Names of Orientations
-  const std::string OrientationString[] = {
-    "Horizontal",
-    "Vertical"
-  };
+  const std::string OrientationString[] =
+    {
+      "Horizontal",
+      "Vertical"
+    };
+
+  //! An enumeration for the Positions of some Elements (FixedPositionBox as an example).
+  typedef enum {
+    Left,               //!< Left
+    Right,              //!< Right
+    Top,                //!< Top
+    Bottom,             //!< Bottom
+    TopLeft,            //!< TopLeft
+    TopRight,           //!< TopRight
+    BottomLeft,         //!< BottomLeft
+    BottomRight,        //!< BottomRight
+    Center,             //!< Centered
+  } Position;
+
+  //! Names of Positions
+  const std::string PositionString[] =
+    {
+      "Left",
+      "Right",
+      "Top",
+      "Bottom",
+      "TopLeft",
+      "TopRight",
+      "BottomLeft",
+      "BottomRight",
+      "Center"
+    };
+
 
   //! An enumerator that defines the different states Widgets may be in.
@@ -39 +68 @@
 #define GLGUI_DEFAULT_STYLE OrxGui::Normal
 
-//! names of the States.
+  //! names of the States.
   const std::string StateString[] =
     {
@@ -48 +77 @@
     };
 
-    //! Where a Certain feature will be positioned at.
-    typedef enum {
-      FeatureLeft,          //!< On the Left side.
-      FeatureRight,         //!< On the Right side.
-      FeatureTop,           //!< On Top of the rest of the Widget.
-      FeatureBottom,        //!< At the Bottom of the rest of the Widget.
-    } FeaturePosition;
+  //! Where a Certain feature will be positioned at.
+  typedef enum {
+    FeatureLeft,          //!< On the Left side.
+    FeatureRight,         //!< On the Right side.
+    FeatureTop,           //!< On Top of the rest of the Widget.
+    FeatureBottom,        //!< At the Bottom of the rest of the Widget.
+  } FeaturePosition;
 
-    //! Names of Feature-Positions
-    const std::string FeaturePositionString[] =
+  //! Names of Feature-Positions
+  const std::string FeaturePositionString[] =
     {
       "Left",

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

@@ -28 +28 @@
 #include "debug.h"
 
-#include <cassert>
-
 
 /// TAKE THIS OUT OF HERE.
@@ -46 +44 @@
     this->setName("GLGuiHandler");
 
+    this->_resolution = Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY());
 
     EventHandler::getInstance()->withUNICODE(ES_MENU, true );
@@ -52 +51 @@
     for (unsigned int i = 0; i < EV_NUMBER; i++)
     {
-      this->subscribeEvent(ES_ALL, i);
+      this->subscribeEvent(ES_GAME, i);
+      this->subscribeEvent(ES_GAME_MENU, i);
+      this->subscribeEvent(ES_MENU, i);
     }
   }
@@ -88 +89 @@
       this->_cursor = NULL;
     }
+  }
+
+  const Vector2D& GLGuiHandler::resolution()
+  {
+    if (this->_resolution == Vector2D::nullVector())
+      this->_resolution = Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY());
+    return _resolution;
   }
 
@@ -244 +252 @@
         if (this->_cursor != NULL)
           this->_cursor->setMaxBorders(Vector2D(event.resize.w, event.resize.h));
-        break;
+        this->_resolution = Vector2D(event.resize.w, event.resize.h);
+        break;
+
       case SDLK_TAB:
         if (event.bPressed)

trunk/src/lib/gui/gl/glgui_handler.h

@@ -12 +12 @@
 namespace OrxGui
 {
-
+ // FORWARD DECLARATION
   class GLGuiCursor;
 
-  // FORWARD DECLARATION
 
   //! A singleton class for the GLGui-Handler
@@ -22 +21 @@
 
   public:
-    virtual ~GLGuiHandler(void);
     /** @returns a Pointer to the only object of this Class */
     inline static GLGuiHandler* getInstance(void) { if (!GLGuiHandler::singletonRef) GLGuiHandler::singletonRef = new GLGuiHandler();  return GLGuiHandler::singletonRef; };
+    /** @brief deletes the instance if it exists */
+    inline static void deleteInstance() { if (GLGuiHandler::singletonRef) delete GLGuiHandler::singletonRef; };
 
     void activateCursor();
@@ -33 +33 @@
     const Vector2D& cursorPositionAbs() const;
     Vector2D cursorPositionRel(const GLGuiWidget* const widget) const;
+
+    const Vector2D& resolution();
 
     void selectNext();
@@ -48 +50 @@
   private:
     GLGuiHandler(void);
+    virtual ~GLGuiHandler(void);
     static GLGuiHandler* singletonRef;
 
@@ -53 +56 @@
     bool                 isActive;
     GLGuiCursor*         _cursor;
+    Vector2D             _resolution;
 
   };

trunk/src/lib/gui/gl/glgui_text.cc

@@ -101 +101 @@
   {
     this->_text.clear();
-    this->changedText();
+    this->resize();
   }
+
 
   /**
@@ -114 +115 @@
     this->setFrontColor(_changedTextColor, true);
     this->textChanged.emit(this->_text.text());
+  }
+
+  void GLGuiText::setTextSize(float size)
+  {
+    this->_text.setSize(size);
+    this->changedText();
+  }
+
+  void GLGuiText::setFont(const Font& font)
+  {
+    GLGuiWidget::setFont(font);
+    this->_text.setFont(font);
   }
 

trunk/src/lib/gui/gl/glgui_text.h

@@ -31 +31 @@
     void clear();
 
+    void setTextSize(float size);
+    virtual void setFont(const Font& font);
     void setChangedTextColor(const Color& color);
 

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

@@ -79 +79 @@
     if (this == GLGuiWidget::selected())
       this->unselect();
+
+    if (this->_parent != NULL)
+      this->_parent->removeChildWidget(this);
   }
 
@@ -84 +87 @@
   GLGuiWidget* GLGuiWidget::_mouseFocused = NULL;
   GLGuiWidget* GLGuiWidget::_inputGrabber = NULL;
-
+  Font* GLGuiWidget::_defaultFont = NULL;
 
 
@@ -100 +103 @@
     this->_state = OrxGui::Normal;
 
-
-    this->_font = Font(ResourceManager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);
+    if(GLGuiWidget::_defaultFont == NULL)
+      GLGuiWidget::_defaultFont = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);
+
+    this->_font = *GLGuiWidget::_defaultFont;
     this->resetStyle();
 
@@ -776 +781 @@
   void GLGuiWidget::setFont(const std::string& fontName, unsigned int renderSize)
   {
-    this->_font = Font(fontName, renderSize);
+    this->setFont(Font(fontName, renderSize));
   }
 

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

@@ -206 +206 @@
     void setFeaturePositionS(const std::string& featurePosition);
 
-    void setFont(const Font& font);
-    void setFont(const std::string& fontName, unsigned int renderSize);
+    virtual void setFont(const Font& font);
+    void setFont(const std::string& fontName, unsigned int renderSize = FONT_DEFAULT_RENDER_SIZE);
 
     void setAnimatedStateChanges(bool animated);
@@ -270 +270 @@
     virtual void destroying();
 
+    // unparent the widget and from this widget seen as parent
+    virtual void removeChildWidget(GLGuiWidget* widget) {};
+
 
     virtual void debug(unsigned int level) const;
@@ -323 +326 @@
     Font                           _font;                 //!< The Font used in the current Widget.
 
+    static Font*                   _defaultFont;          //!< The default Font.
 
     /// ANIMATION STUFF: