Changeset 8419 in orxonox.OLD

Timestamp:

Jun 14, 2006, 11:07:48 PM (18 years ago)

Author:

bensch

Message:

Better coloring sceme

Location:

branches/gui/src

Files:

• lib/graphics/text_engine/multi_line_text.cc (modified) (1 diff)
• lib/graphics/text_engine/text.cc (modified) (6 diffs)
• lib/graphics/text_engine/text.h (modified) (5 diffs)
• lib/gui/gl/glgui_bar.cc (modified) (1 diff)
• lib/gui/gl/glgui_button.cc (modified) (2 diffs)
• lib/gui/gl/glgui_button.h (modified) (1 diff)
• lib/gui/gl/glgui_inputline.cc (modified) (7 diffs)
• lib/gui/gl/glgui_inputline.h (modified) (2 diffs)
• lib/gui/gl/glgui_widget.cc (modified) (4 diffs)
• lib/gui/gl/glgui_widget.h (modified) (6 diffs)
• lib/util/color.cc (modified) (1 diff)
• lib/util/color.h (modified) (2 diffs)
• util/hud.cc (modified) (1 diff)

branches/gui/src/lib/graphics/text_engine/multi_line_text.cc

@@ -76 +76 @@
   glActiveTexture(GL_TEXTURE0);
 
-  glColor4f(this->getColor().x, this->getColor().y, this->getColor().z, this->getBlending());
+  glColor4fv(&this->getColor()[0]);
   glEnable(GL_BLEND);
   glEnable(GL_TEXTURE_2D);
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
 

branches/gui/src/lib/graphics/text_engine/text.cc

@@ -37 +37 @@
   this->size = textSize;
   this->setSizeY2D(size);
-  this->blending = TEXT_DEFAULT_BLENDING;
   this->color = TEXT_DEFAULT_COLOR;
 
@@ -73 +72 @@
           this->size == text.size &&
           this->font == text.font &&
-          this->color == text.color &&
-          this->blending == text.blending);
+          this->color == text.color);
 }
 
@@ -95 +93 @@
 {
   this->size = text.size;
-  this->blending = text.blending;
   this->color = text.color;
   this->setAlignment(text.getAlignment());
@@ -224 +221 @@
   // drawing this Text.
   // setting the Blending effects
-  glColor4f(this->color.x, this->color.y, this->color.z, this->blending);
+  glColor4fv(&this->color[0]);
 
 
@@ -231 +228 @@
   glEnable(GL_BLEND);
   glEnable(GL_TEXTURE_2D);
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
 
@@ -285 +282 @@
 {
   PRINT(0)("=== TEXT: %s (with Font:'%s')  displaying %s ===\n", this->getName(), this->font->getName(), this->text.c_str());
-  PRINT(0)("Color: %0.2f %0.2f %0.2f\n", this->color.x, this->color.y, this->color.z);
-}
-
+  PRINT(0)("Color: r=%0.2f g=%0.2f b=%0.2f a=%0.2f\n", this->color.r(), this->color.g(), this->color.b(), this->color.a());
+}
+

branches/gui/src/lib/graphics/text_engine/text.h

@@ -8 +8 @@
 
 #include "element_2d.h"
+#include "color.h"
 
 #define  TEXT_ALIGN_LEFT             E2D_ALIGN_LEFT
@@ -13 +14 @@
 #define  TEXT_ALIGN_CENTER           E2D_ALIGN_CENTER
 #define  TEXT_ALIGN_SCREEN_CENTER    E2D_ALIGN_SCREEN_CENTER
-#define  TEXT_DEFAULT_COLOR          Vector(1.0, 1.0, 1.0)      //!< the default Color (white)
-#define  TEXT_DEFAULT_BLENDING       1.0f                       //!< the default blending of the text, (no blending at all)
+#define  TEXT_DEFAULT_COLOR          Color(1.0, 1.0, 1.0, 1.0f) //!< the default Color (white, fully visible)
 
 #define  TEXT_DEFAULT_ALIGNMENT      TEXT_ALIGN_LEFT            //!< default alignment
@@ -44 +44 @@
     void setFont(const std::string& fontFile, unsigned int renderSize);
     /** @param blending the blending intensity to set (between 0.0 and 1.0) */
-    inline void setBlending(float blending) { this->blending = blending; };
+    inline void setBlending(float blending) { this->color.a() = blending; };
     /** @param r red @param g green @param b blue @brief sets the Color of the Text to render (values in [0-1]) */
-    void setColor(float r, float g, float b) { this->color = Vector(r, g, b); };
+    void setColor(float r, float g, float b) { this->color = Color(r, g, b, this->color.a()); };
+    void setColor(float r, float g, float b, float a) { this->color = Color(r, g, b, a); };
+    void setColor(const Color& color) { this->color = color; };
     void setSize(float size);
 
@@ -57 +59 @@
     inline const Font* const getFont() const { return this->font; };
     /** @returns the Blending Value [0 invisible 1.0 full visible */
-    inline float getBlending() const { return this->blending; };
+    inline float getBlending() const { return this->color.a(); };
     /** @returns: a Vector(r,g,b) @brief: retrieve a Vector holding the Color of the Text */
-    inline const Vector& getColor() const { return this->color; };
+    inline const Color& getColor() const { return this->color; };
     /** @returns the Size of the Text */
     inline float getSize() const { return this->size; };
@@ -76 +78 @@
 
     std::string       text;           //!< The text to display
-    Vector            color;          //!< The color of the font.
-    float             blending;       //!< The blending intensity.
+    Color             color;          //!< The color of the font.
     float             size;           //!< The size of the Text.
 };

branches/gui/src/lib/gui/gl/glgui_bar.cc

@@ -46 +46 @@
     this->setClassID(CL_GLGUI_BAR, "GLGuiBar");
 
-    this->frontColor().setColor(1,1,1);
+    this->setFrontColor(Color(1,1,1));
 
     this->setSize2D(50, 10);

branches/gui/src/lib/gui/gl/glgui_button.cc

@@ -55 +55 @@
 
     this->_label.setFont("fonts/final_frontier.ttf", 20);
-    this->frontColor().setColor(1, 0, 0, 1.0);
+    this->setFrontColor(Color(1, 0, 0, 1.0));
 
     this->_label.setParent2D(this);
@@ -69 +69 @@
 
 
+  void GLGuiButton::updateFrontColor()
+  {
+    this->_label.setColor(this->frontColor());
+    printf("TEST Color is "); this->frontColor().debug();
+  }
 
   void GLGuiButton::clicking(const Vector2D& pos)
   {
+    GLGuiWidget::clicking(pos);
     emit(clicked());
   }
   void GLGuiButton::releasing(const Vector2D& pos)
   {
+    GLGuiWidget::releasing(pos);
     emit(released());
   }

branches/gui/src/lib/gui/gl/glgui_button.h

@@ -45 +45 @@
 
     protected:
+      virtual void updateFrontColor();
+
       virtual void clicking(const Vector2D& pos);
       virtual void releasing(const Vector2D& pos);

branches/gui/src/lib/gui/gl/glgui_inputline.cc

@@ -48 +48 @@
     this->setFocusable(true);
 
-    this->text.setParent2D(this);
-    this->text.setRelCoor2D(4,4);
-    this->text.setFont("fonts/final_frontier.ttf", 20);
-    this->text.setVisibility(false);
+    this->_text.setParent2D(this);
+    this->_text.setRelCoor2D(4,4);
+    this->_text.setFont("fonts/final_frontier.ttf", 20);
+    this->_text.setVisibility(false);
     this->resize();
 
@@ -63 +63 @@
   void GLGuiInputLine::setText(const std::string& text)
   {
-    this->text.setText(text);
-    this->resize();
-
-    emit(this->textChanged(this->getText()));
+    this->_text.setText(text);
+    this->resize();
+
+    emit(this->textChanged(this->_text.getText()));
   }
 
@@ -75 +75 @@
   void GLGuiInputLine::append(const std::string& appendText)
   {
-    this->text.append(appendText);
-    this->resize();
-    emit(this->textChanged(this->text.getText()));
+    this->_text.append(appendText);
+    this->resize();
+    emit(this->textChanged(this->_text.getText()));
   }
 
@@ -87 +87 @@
   void GLGuiInputLine::appendCharacter(char character)
   {
-    this->text.appendCharacter(character);
-    this->resize();
-    emit(this->textChanged(this->text.getText()));
+    this->_text.appendCharacter(character);
+    this->resize();
+    emit(this->textChanged(this->_text.getText()));
   }
 
@@ -99 +99 @@
   void GLGuiInputLine::removeCharacters(unsigned int chars)
   {
-    this->text.removeCharacters(chars);
-    this->resize();
-    emit(this->textChanged(this->text.getText()));
+    this->_text.removeCharacters(chars);
+    this->resize();
+    emit(this->textChanged(this->_text.getText()));
   }
 
@@ -164 +164 @@
   void GLGuiInputLine::resize()
   {
-    this->text.setRelCoor2D(this->borderLeft() + 2.0,this->borderTop() + 2.0);
-    this->setSize2D( this->text.getSize2D() + Vector2D(borderLeft() + borderRight() + 4.0, borderTop() + borderBottom() + 4.0));
+    this->_text.setRelCoor2D(this->borderLeft() + 2.0,this->borderTop() + 2.0);
+    this->setSize2D( this->_text.getSize2D() + Vector2D(borderLeft() + borderRight() + 4.0, borderTop() + borderBottom() + 4.0));
     GLGuiWidget::resize();
 /*    this->frontRect().setTopLeft(borderLeft(), borderTop());
@@ -171 +171 @@
   }
 
+  void GLGuiInputLine::updateFrontColor()
+  {
+    this->_text.setColor(this->frontColor());
+  }
 
   void GLGuiInputLine::hiding()
   {
-    this->text.setVisibility(false);
+    this->_text.setVisibility(false);
   }
 
   void GLGuiInputLine::showing()
   {
-    this->text.setVisibility(true);
+    this->_text.setVisibility(true);
   }
 

branches/gui/src/lib/gui/gl/glgui_inputline.h

@@ -32 +32 @@
 
     /** @returns the text of the inputLine */
-    const std::string& getText() const { return this->text.getText(); };
+    const std::string& _getText() const { return this->_text.getText(); };
 
     void setText(const std::string& text);
@@ -48 +48 @@
     DeclareSignal1(textChanged, const std::string&);
 
+  protected:
+    virtual void updateFrontColor();
+    virtual void hiding();
+    virtual void showing();
+
+
   private:
     void init();
     void resize();
-    virtual void hiding();
-    virtual void showing();
 
   private:
-    Text                    text;             //!< The Text to display inside of the InputLine.
+    Text                    _text;            //!< The Text to display inside of the InputLine.
 
     Uint16                  pressedKey;       //!< the pressed key that will be repeated.

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

@@ -66 +66 @@
     this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
 
-    this->_backMat.setDiffuse(1.0, 1.0, 1.0);
+    this->_backMat.setDiffuse(0.0, 0.0, 0.0);
     this->_frontColor.setColor(1.0, 0.0, 0.0);
 
@@ -176 +176 @@
   void GLGuiWidget::clicking(const Vector2D& pos)
   {
-    this->frontColor().setColor(0, 0, 1);
+    this->setFrontColor(Color(0, 0, 1));
 
   }
@@ -182 +182 @@
   void GLGuiWidget::releasing(const Vector2D& pos)
   {
-    this->frontColor().setColor(0,1,0);
+    this->setFrontColor(Color(0,1,0));
 
   }
@@ -188 +188 @@
   void GLGuiWidget::receivedFocus()
   {
-    this->frontColor().setColor(0, 1, 0);
+    this->setFrontColor(Color(0, 1, 0));
   }
 
   void GLGuiWidget::removedFocus()
   {
-    this->frontColor().setColor(1, 0, 0);
+    this->setFrontColor(Color(1, 0, 0));
 
   }
 
   void GLGuiWidget::destroyed()
-  {}
-  ;
+  {
+  };
+
 
   void GLGuiWidget::setWidgetSize(const Vector2D& size)

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

@@ -35 +35 @@
    */
   class GLGuiWidget : public Element2D
-{
+  {
   public:
-  //! An enumerator that defines the different states Widgets may be in.
-  typedef enum {
-    Normal,           //!< Normal state of the GUI's Widgets.
-    Active,           //!< If the widget is Active.
-    Selected,         //!< If the Widget is Selected.
-    Insensitive       //!< If the Widget is insensitive.
-  } State;
+    //! An enumerator that defines the different states Widgets may be in.
+    typedef enum {
+      Normal,           //!< Normal state of the GUI's Widgets.
+      Active,           //!< If the widget is Active.
+      Selected,         //!< If the Widget is Selected.
+      Insensitive       //!< If the Widget is insensitive.
+    } State;
 
 
@@ -92 +92 @@
     const Rect2D& backRect() const { return this->_backRect; };
 
-    Color& frontColor() { return this->_frontColor; };
+    void setFrontColor(const Color& frontColor) { this->_frontColor = frontColor; this->updateFrontColor(); };
     const Color& frontColor() const { return this->_frontColor; };
 
@@ -114 +114 @@
     void setBackgroundColor(float x, float y, float z) { this->backMaterial().setDiffuse(x,y,z); };
 
-    inline void drawRect(const Rect2D& rect) const {
+    inline void drawRect(const Rect2D& rect) const
+    {
       glBegin(GL_QUADS);
       glTexCoord2i(0,0); glVertex2d(rect.left(), rect.top());
@@ -130 +131 @@
     virtual bool processEvent(const Event& event) { return false; };
 
+
   protected:
-
     /// LOOKS
     virtual void resize();
@@ -137 +138 @@
     virtual void hiding() {};
     virtual void showing() {};
+    virtual void updateFrontColor() {};
+
+    inline void beginDraw() const { glPushMatrix(); glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0); };
+    inline void endDraw() const { glPopMatrix(); };
+
+    /// EVENTS
     // if something was clickt on the GUI-widget.
     virtual void clicking(const Vector2D& pos);
@@ -145 +152 @@
     virtual void destroyed();
 
-
-    inline void beginDraw() const { glPushMatrix(); glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0); };
-    inline void endDraw() const { glPopMatrix(); };
-
   private:
     void init();
-
 
   private:

branches/gui/src/lib/util/color.cc

@@ -18 +18 @@
 #include "color.h"
 #include <stdio.h>
+
+
+void Color::debug() const
+{
+  printf("r:%0.2f g:%0.2f, b:%0.2f, a:%0.2f\n", r(), g(), b(), a());
+}
 
 /**

branches/gui/src/lib/util/color.h

@@ -19 +19 @@
   Color(const Color& c) { _rgba[0] = c.r(); _rgba[1] = c.g(); _rgba[2] = c.b(); _rgba[3] = c.a(); }
 
+  const Color& operator=(const Color& c) { _rgba[0] = c.r(); _rgba[1] = c.g(); _rgba[2] = c.b(); _rgba[3] = c.a(); return *this; };
+  bool operator==(const Color& c) const { return (r() == c.r() && g() == c.g() && b() == c.b() && a() == c.a()); };
+
   inline float& operator[](unsigned int i) { return _rgba[i]; }
   inline const float& operator[](unsigned int i) const { return _rgba[i]; }
@@ -31 +34 @@
   inline float& a() { return _rgba[3]; }
 
+
+
   void setColor(float r = 0.0f, float g = 0.0f, float b = 0.0f, float a = 1.0f) { _rgba[0] = r; _rgba[1] = g; _rgba[2] = b; _rgba[3] = a; };
 
+  void debug() const;
 
   /// STATIC TRANSFORMATIONS

branches/gui/src/util/hud.cc

@@ -132 +132 @@
       weapon->getEnergyWidget()->backMaterial().setDiffuse( .8,.2,.11);
       weapon->getEnergyWidget()->backMaterial().setTransparency(.1);
-      weapon->getEnergyWidget()->frontColor().setColor( .2,.5,.7,.6);
+      weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
 //      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
       this->weaponsWidgets.push_back(weapon->getEnergyWidget());