Changeset 8977 in orxonox.OLD

Timestamp:

Jul 1, 2006, 1:17:57 PM (18 years ago)

Author:

bensch

Message:

trunk: gui displayes nicely

Location:

trunk/src/world_entities

Files:

• elements/glgui_energywidget.cc (modified) (4 diffs)
• elements/glgui_energywidget.h (modified) (2 diffs)
• weapons/weapon.cc (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -28 +28 @@
     //   this->setClassID(CL_PROTO_ID, "GLGuiEnergyWidget");
 
+    this->pack(&this->name);
     this->pack(&this->text);
     this->pack(&this->bar);
@@ -42 +43 @@
 
 
+  void GLGuiEnergyWidget::setDisplayedName(const std::string& name)
+  {
+    this->name.setText(name);
+  }
 
   void GLGuiEnergyWidget::setMaximum(float max)
@@ -60 +65 @@
   void GLGuiEnergyWidget::showing()
   {
+    this->name.show();
     this->text.show();
     this->bar.show();
@@ -66 +72 @@
   void GLGuiEnergyWidget::hiding()
   {
+    this->name.hide();
     this->text.hide();
     this->bar.hide();
   }
-
-
-
 }

trunk/src/world_entities/elements/glgui_energywidget.h

@@ -22 +22 @@
     virtual ~GLGuiEnergyWidget();
 
+    void setDisplayedName(const std::string& name);
     void setMaximum(float max);
     void setValue(float value);
@@ -31 +32 @@
 
   private:
+    GLGuiText               name;
     GLGuiBar                bar;
     GLGuiText               text;

trunk/src/world_entities/weapons/weapon.cc

@@ -312 +312 @@
   if (this->energyWidget == NULL)
   {
-    this->energyWidget = new OrxGui::GLGuiEnergyWidget;
+    this->energyWidget = new OrxGui::GLGuiEnergyWidget();
+    this->energyWidget->setDisplayedName(this->getClassName());
     this->energyWidget->setSize2D( 20, 100);
     this->energyWidget->setMaximum(this->getEnergyMax());

trunk/src/world_entities/world_entity.cc

@@ -682 +682 @@
   {
     this->healthWidget = new OrxGui::GLGuiEnergyWidget();
+    this->healthWidget->setDisplayedName(std::string(this->getClassName()) + " Energy:");
     this->healthWidget->setSize2D(30,400);
     this->healthWidget->setAbsCoor2D(10,100);