Changeset 8991 in orxonox.OLD for trunk/src/world_entities/elements

Timestamp:

Jul 1, 2006, 8:16:09 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: added a Radar class, to display radar as Widget

Location:

trunk/src/world_entities/elements

Files:

• glgui_energywidget.cc (modified) (1 diff)
• glgui_radar.cc (copied) (copied from trunk/src/world_entities/elements/glgui_energywidget.cc) (4 diffs)
• glgui_radar.h (copied) (copied from trunk/src/world_entities/elements/glgui_energywidget.h) (3 diffs)

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -32 +32 @@
     this->_bar.setParent2D(&this->_valueText);
 
-    this->setBackgroundTexture("maps/gui_element_background_2.png");
+    this->_name.setForegroundColor(Color(1,1,1,.8));
+    this->_valueText.setChangedTextColor(Color::white);
+
+    //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->_name.setBackgroundTexture(Texture());
+    //this->_valueText.setBackgroundTexture("maps/gui_element_background_2.png");
     this->_bar.setBackgroundTexture(Texture());
     this->_bar.setBackgroundColor(Color(0,0,0,0));
     this->_bar.setForegroundTexture("maps/gui_element_background_faded.png");
     this->_bar.setForegroundColor(Color(.5, .5, .5, 1));
+    this->_bar.setChangedValueColor(Color::black);
   }
 

trunk/src/world_entities/elements/glgui_radar.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "glgui_energywidget.h"
+#include "glgui_radar.h"
 
 namespace OrxGui
@@ -23 +23 @@
    * @brief standard constructor
    */
-  GLGuiEnergyWidget::GLGuiEnergyWidget ()
+  GLGuiRadar::GLGuiRadar ()
   {
-    //   this->setClassID(CL_PROTO_ID, "GLGuiEnergyWidget");
-
-    this->_bar.setSize2D(100, 30);
-    this->pack(&this->_name);
-    this->pack(&this->_valueText);
-    this->_bar.setParent2D(&this->_valueText);
-
-    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->_bar.setBackgroundTexture(Texture());
-    this->_bar.setBackgroundColor(Color(0,0,0,0));
-    this->_bar.setForegroundTexture("maps/gui_element_background_faded.png");
-    this->_bar.setForegroundColor(Color(.5, .5, .5, 1));
   }
 
@@ -47 +31 @@
    * @brief standard deconstructor
    */
-  GLGuiEnergyWidget::~GLGuiEnergyWidget ()
+  GLGuiRadar::~GLGuiRadar ()
   {
   }
 
 
-  void GLGuiEnergyWidget::setDisplayedName(const std::string& name)
+  void GLGuiRadar::resize()
   {
-    this->_name.setText(name);
-    this->_bar.setWidgetSize(this->_name.getSize2D());
-  }
-
-  void GLGuiEnergyWidget::setMaximum(float max)
-  {
-    this->_bar.setMaximum(max);
-  }
-
-  void GLGuiEnergyWidget::setValue(float value)
-  {
-    MultiType val(value);
-    val.setType(MT_INT);
-
-
-    this->_bar.setValue(value);
-    this->_bar.setForegroundColor(Color::slerpHSVColor(Color::red, Color::green, value/this->_bar.maximum()));
-    this->_bar.setFrontColor(Color(1,1,1,1), true);
-    this->_valueText.setText(val.getString());
-  }
-
-  void GLGuiEnergyWidget::resize()
-  {
-    GLGuiBox::resize();
+    GLGuiWidget::resize();
   }
 
 
-  void GLGuiEnergyWidget::showing()
+  void GLGuiRadar::showing()
   {
-    this->_name.show();
-    this->_valueText.show();
-    this->_bar.show();
   }
 
-  void GLGuiEnergyWidget::hiding()
+  void GLGuiRadar::hiding()
   {
-    this->_name.hide();
-    this->_valueText.hide();
-    this->_bar.hide();
   }
 }

trunk/src/world_entities/elements/glgui_radar.h

@@ -1 +1 @@
 /*!
- * @file glgui_energywidget.h
- * @brief Definition of an EnergyWidget, that displays a bar and a Text
+ * @file glgui_radar.h
+ * @brief Definition of an Radar, that displays a bar and a Text
 */
 
-#ifndef _GLGUI_ENERGY_WIDGET_H
-#define _GLGUI_ENERGY_WIDGET_H
+#ifndef _GLGUI_RADAR_H
+#define _GLGUI_RADAR_H
 
-#include "glgui_box.h"
-#include "glgui_bar.h"
-#include "glgui_text.h"
+#include "glgui_widget.h"
+
+class WorldEntity;
 
 namespace OrxGui
@@ -15 +15 @@
 
   //! A class for ...
-  class GLGuiEnergyWidget : public GLGuiBox
+  class GLGuiRadar : public GLGuiWidget
   {
 
   public:
-    GLGuiEnergyWidget();
-    virtual ~GLGuiEnergyWidget();
+    GLGuiRadar();
+    virtual ~GLGuiRadar();
 
-    void setDisplayedName(const std::string& name);
-    void setMaximum(float max);
-    void setValue(float value);
+    void setRange(float range);
+    float range() const { return this->_range; }
 
   protected:
@@ -32 +31 @@
 
   private:
-    GLGuiText               _name;
-    GLGuiText               _valueText;
-    GLGuiBar                _bar;
+    typedef struct
+    {
+
+      Color                     dotColor;
+      std::list<WorldEntity*>&  entityList;
+      std::vector<Vector2D>     position;
+    } DotList;
+
+    std::vector<DotList>        _dotLists;
+
+    float                       _range;
 
   };
 }
-#endif /* _GLGUI_ENERGY_WIDGET_H */
+#endif /* _GLGUI_RADAR_H */