Changeset 7924 in orxonox.OLD

Timestamp:

May 28, 2006, 5:04:08 PM (18 years ago)

Author:

bensch

Message:

gui: introducing rect into gui

Location:

branches/gui/src

Files:

• lib/gui/gl_gui/glgui.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_cursor.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_slider.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.cc (modified) (4 diffs)
• lib/gui/gl_gui/glgui_widget.h (modified) (3 diffs)
• story_entities/simple_game_menu.cc (modified) (2 diffs)
• story_entities/simple_game_menu.h (modified) (1 diff)

branches/gui/src/lib/gui/gl_gui/glgui.h

@@ -7 +7 @@
 #define _GLGUI_H
 
+#include "glgui_defs.h"
 #include "glgui_handler.h"
 

branches/gui/src/lib/gui/gl_gui/glgui_cursor.cc

@@ -88 +88 @@
 
 
-      this->setAbsCoorSoft2D(newPos, 10);
+      this->setAbsCoor2D(newPos);
       movement = Vector2D();
     }

branches/gui/src/lib/gui/gl_gui/glgui_slider.h

@@ -26 +26 @@
     virtual ~GLGuiSlider();
 
-    void init();
+    /** @returns the Value of the Slider. */
+    float value() const { return this->_value; }
+    /** @returns the minimum of the sliders range */
+    float min() const { return this->_minValue; };
+    /** @returns the maximum of the sliders range */
+    float max() const { return this->_maxValue; };
+    /** @returns the step size */
+    float step() const { return this->_step; };
+
+    void setValue(float value);
+
+    void setMin(float minimum);
+    void setMax(float maximum);
+    void setRange(float minimum, float maximum);
+
+    void setStep(float step);
+
 
     virtual void draw() const;
 
   private:
+    void init();
+    private:
+
     Orientation      orientation;
 
     float            _maxValue;
     float            _minValue;
+    float            _step;
 
     float            _value;

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

@@ -28 +28 @@
 
   /**
-   * standard constructor
+   * @brief standard constructor
   */
-  GLGuiWidget::GLGuiWidget ( )
+  GLGuiWidget::GLGuiWidget (GLGuiWidget* parent)
   {
     this->init();
-  }
-
-
-  /**
-   * standard deconstructor
+
+    if (parent != NULL)
+      parent->addChild2D(this);
+  }
+
+
+  /**
+   * @brief standard deconstructor
    */
   GLGuiWidget::~GLGuiWidget()
@@ -63 +66 @@
     this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
 
-    this->backMat.setDiffuse(1.0, 1.0, 1.0);
-    this->frontMat.setDiffuse(1.0, 0.0, 0.0);
+    this->_backMat.setDiffuse(1.0, 1.0, 1.0);
+    this->_frontMat.setDiffuse(1.0, 0.0, 0.0);
 
     this->widgetSignals.resize(SignalCount, SignalConnector());
@@ -130 +133 @@
   void GLGuiWidget::released()
   {
-    this->frontMat.setDiffuse(0,1,0);
+    this->frontMaterial().setDiffuse(0,1,0);
 
   }
@@ -194 +197 @@
   void GLGuiWidget::draw() const
   {
-    this->backMat.select();
+    this->backMaterial().select();
 
     glBegin(GL_QUADS);

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

@@ -53 +53 @@
 
   public:
-    GLGuiWidget();
+    GLGuiWidget(GLGuiWidget* parent = NULL);
     virtual ~GLGuiWidget();
 
@@ -92 +92 @@
 
     /// MATERIAL (looks)
-    Material& backMaterial() { return this->backMat; };
-    const Material& backMaterial() const { return this->backMat; };
+    Material& backMaterial() { return this->_backMat; };
+    const Material& backMaterial() const { return this->_backMat; };
+    Rect2D& backRect() { return this->_backRect; };
+    const Rect2D& backRect() const { return this->_backRect; };
 
-    Material& frontMaterial() { return this->frontMat; };
-    const Material& frontMaterial() const { return this->frontMat; };
+    Material& frontMaterial() { return this->_frontMat; };
+    const Material& frontMaterial() const { return this->_frontMat; };
+    Rect2D& frontRect() { return this->_frontRect; };
+    const Rect2D& frontRect() const { return this->_frontRect; };
+
+    inline void drawRect(const Rect2D& rect) {
+      glBegin(GL_QUADS);
+      glTexCoord2i(0,0); glVertex2d(rect.left(), rect.top());
+      glTexCoord2i(0,1); glVertex2d(rect.left(), rect.bottom());
+      glTexCoord2i(1,1); glVertex2d(rect.right(), rect.bottom());
+      glTexCoord2i(1,0); glVertex2d(rect.right(), rect.top());
+      glEnd();
+    }
 
     /** @param the Event to process. @returns true if the Event has been consumed*/
@@ -123 +136 @@
   private:
     /// LOOKS
-    Material                       backMat;
-    Rect2D                         backRect;
+    Material                       _backMat;
+    Rect2D                         _backRect;
 
-    Material                       frontMat;
-    Rect2D                         frontRect;
+    Material                       _frontMat;
+    Rect2D                         _frontRect;
 
 

branches/gui/src/story_entities/simple_game_menu.cc

@@ -66 +66 @@
   /// GUI
   ///(this is as modular as it is possible).
+  /*
   OrxGui::GLGuiPushButton* pb = new OrxGui::GLGuiPushButton("PUSH ME");
   pb->connectSignal(OrxGui::Signal_release, this, createExecutor<SimpleGameMenu>(&SimpleGameMenu::enterGui));
@@ -73 +74 @@
   OrxGui::GLGuiHandler::getInstance()->activateCursor();
   OrxGui::GLGuiHandler::getInstance()->activate();
+  */
   /////
 

branches/gui/src/story_entities/simple_game_menu.h

@@ -31 +31 @@
 
   public:
-    std::vector<TextElement*>          menuList;                        //!< the list of the menu items
+    std::vector<TextElement*>         menuList;                        //!< the list of the menu items
     std::vector<StoryEntity*>         storyList;                       //!< the list of the StoryEntities for the menu
     std::vector<ImageEntity*>         screenshootList;                 //!< list of the screen shoots FIXME: make a better structure for this stuff