Changeset 8980 in orxonox.OLD

Timestamp:

Jul 1, 2006, 3:18:43 PM (18 years ago)

Author:

bensch

Message:

trunk: more gui in the Hud

Location:

trunk/src

Files:

• lib/graphics/text_engine/limited_width_text.h (modified) (1 diff)
• lib/gui/gl/glgui_text.cc (modified) (2 diffs)
• lib/gui/gl/glgui_text.h (modified) (3 diffs)
• world_entities/elements/glgui_energywidget.cc (modified) (4 diffs)
• world_entities/elements/glgui_energywidget.h (modified) (1 diff)

trunk/src/lib/graphics/text_engine/limited_width_text.h

@@ -26 +26 @@
     // Setup:
     void setLineWidth(float lineWidth);
-    void setDotsPosition(DotsPosition dotsPosition);
+    void setDotsPosition(LimitedWidthText::DotsPosition dotsPosition);
 
     // Retrieve:

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

@@ -48 +48 @@
     this->_text.setRelCoor2D(4,4);
     this->_text.setFont("fonts/final_frontier.ttf", 20);
+    this->_text.setLineWidth(400);
+    this->_text.setDotsPosition(LimitedWidthText::Begin);
     this->_text.setColor(foregroundColor());
     this->_text.setVisibility(false);
@@ -122 +124 @@
     this->_text.setRelCoor2D(borderLeft(), borderTop());
     this->setSize2D( this->_text.getSize2D() + Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));
+    //this->_text.setLineWidth(this->size2D);
     GLGuiWidget::resize();
     /*    this->frontRect().setTopLeft(borderLeft(), borderTop());

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

@@ -9 +9 @@
 
 #include "glgui_widget.h"
-#include "text.h"
+#include "limited_width_text.h"
 // FORWARD DECLARATION
 namespace OrxGui
@@ -31 +31 @@
     void clear();
 
+    void setDotsPosition(LimitedWidthText::DotsPosition dotsPosition) { this->_text.setDotsPosition(dotsPosition); };
+
     const std::string& text() const { return _text.text(); };
 
@@ -50 +52 @@
 
   private:
-    Text              _text;
+    LimitedWidthText    _text;
   };
 }

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -27 +27 @@
   {
     //   this->setClassID(CL_PROTO_ID, "GLGuiEnergyWidget");
+    this->pack(&this->_name);
+    this->pack(&this->_valueText);
+    this->pack(&this->_bar);
 
-    this->pack(&this->name);
-    this->pack(&this->text);
-    this->pack(&this->bar);
+    this->setBackgroundTexture("maps/gui_element_background_2.png");
+    this->setBackgroundColor(Color(.5,.5,.5,1));
+
+    this->_name.setBackgroundTexture(Texture());
+    this->_valueText.setBackgroundTexture("maps/gui_element_background_2.png");
+    this->_valueText.setBackgroundTexture("maps/gui_element_background_2.png");
+    this->_bar.setBackgroundTexture(Texture());
   }
 
@@ -45 +52 @@
   void GLGuiEnergyWidget::setDisplayedName(const std::string& name)
   {
-    this->name.setText(name);
+    this->_name.setText(name);
   }
 
   void GLGuiEnergyWidget::setMaximum(float max)
   {
-    this->bar.setMaximum(max);
+    this->_bar.setMaximum(max);
   }
 
@@ -58 +65 @@
     val.setType(MT_INT);
 
-    this->bar.setValue(value);
-    this->text.setText(val.getString());
+    this->_bar.setValue(value);
+    this->_valueText.setText(val.getString());
   }
 
@@ -65 +72 @@
   void GLGuiEnergyWidget::showing()
   {
-    this->name.show();
-    this->text.show();
-    this->bar.show();
+    this->_name.show();
+    this->_valueText.show();
+    this->_bar.show();
   }
 
   void GLGuiEnergyWidget::hiding()
   {
-    this->name.hide();
-    this->text.hide();
-    this->bar.hide();
+    this->_name.hide();
+    this->_valueText.hide();
+    this->_bar.hide();
   }
 }

trunk/src/world_entities/elements/glgui_energywidget.h

@@ -32 +32 @@
 
   private:
-    GLGuiText               name;
-    GLGuiBar                bar;
-    GLGuiText               text;
+    GLGuiText               _name;
+    GLGuiBar                _bar;
+    GLGuiText               _valueText;
 
   };