Changeset 8974 in orxonox.OLD for trunk

Timestamp:

Jul 1, 2006, 11:47:08 AM (18 years ago)

Author:

bensch

Message:

trunk: better implemented

Location:

trunk/src

Files:

• lib/gui/gl/glgui_bar.cc (modified) (1 diff)
• world_entities/elements/glgui_energywidget.cc (modified) (2 diffs)
• world_entities/elements/glgui_energywidget.h (modified) (3 diffs)
• world_entities/world_entity.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (2 diffs)

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

@@ -68 +68 @@
   void GLGuiBar::draw() const
   {
-    printf("BAR\n");
     this->beginDraw();
     GLGuiWidget::draw();

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -28 +28 @@
     //   this->setClassID(CL_PROTO_ID, "GLGuiEnergyWidget");
 
-    this->text.setParent2D(this);
-    this->bar.setParent2D(this);
+    this->pack(&this->text);
+    this->pack(&this->bar);
   }
 
@@ -40 +40 @@
     // delete what has to be deleted here
   }
+
+
+  void GLGuiEnergyWidget::setMaximum(float max)
+  {
+    this->bar.setMaximum(max);
+  }
+
+  void GLGuiEnergyWidget::setValue(float value)
+  {
+    MultiType val = value;
+
+    this->bar.setValue(value);
+    this->text.setText(val.getString());
+  }
+
+
+
 }

trunk/src/world_entities/elements/glgui_energywidget.h

@@ -7 +7 @@
 #define _GLGUI_ENERGY_WIDGET_H
 
-#include "glgui_widget.h"
+#include "glgui_box.h"
 #include "glgui_bar.h"
 #include "glgui_text.h"
@@ -15 +15 @@
 
   //! A class for ...
-  class GLGuiEnergyWidget : public GLGuiWidget
+  class GLGuiEnergyWidget : public GLGuiBox
   {
 
@@ -22 +22 @@
     virtual ~GLGuiEnergyWidget();
 
+    void setMaximum(float max);
+    void setValue(float value);
+
   protected:
-    virtual void resize();
+    //virtual void resize();
 
   private:

trunk/src/world_entities/world_entity.cc

@@ -31 +31 @@
 #include "obb_tree.h"
 
-#include "glgui_bar.h"
+#include "elements/glgui_energywidget.h"
 
 #include "state.h"
@@ -681 +681 @@
   if (this->healthWidget == NULL)
   {
-    this->healthWidget = new OrxGui::GLGuiBar();
+    this->healthWidget = new OrxGui::GLGuiEnergyWidget();
     this->healthWidget->setSize2D(30,400);
     this->healthWidget->setAbsCoor2D(10,100);

trunk/src/world_entities/world_entity.h

@@ -24 +24 @@
 // FORWARD DECLARATION
 namespace OrxSound { class SoundBuffer; class SoundSource; }
-namespace OrxGui { class GLGuiWidget; class GLGuiBar; };
+namespace OrxGui { class GLGuiWidget; class GLGuiBar; class GLGuiEnergyWidget; };
 
 class BVTree;
@@ -167 +167 @@
   float                   health;             //!< The Energy of this Entity, if the Entity has any energy at all.
   float                   healthMax;          //!< The Maximal energy this entity can take.
-  OrxGui::GLGuiBar*       healthWidget;       //!< The Slider (if wanted).
+  OrxGui::GLGuiEnergyWidget* healthWidget;    //!< The Slider (if wanted).
 
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.