Changeset 10120 in orxonox.OLD for branches/playability/src/util

Timestamp:

Dec 20, 2006, 12:02:01 PM (18 years ago)

Author:

muellmic

Message:

some interface hacks

File:

• branches/playability/src/util/hud.cc (modified) (4 diffs)

branches/playability/src/util/hud.cc

@@ -24 +24 @@
 #include "glgui_widget.h"
 #include "glgui_box.h"
+#include "elements/glgui_energywidgetvertical.h"
 
 #include "glgui_inputline.h"
@@ -108 +109 @@
     this->energyWidget->show();
     this->energyWidget->shiftDir2D(270);
-    //this->energyWidget->setDisplayedName("Electronics")
+    dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->energyWidget)->setDisplayedName("Electronics");
     this->shipValuesBox->pack(this->energyWidget);
     /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -118 +119 @@
 
 void Hud::setShiledWidget(OrxGui::GLGuiWidget* widget)
-{}
+{
+  // decopple old widget
+  if (this->shieldWidget != NULL)
+  {
+    this->shieldWidget->hide();
+  }
+
+  this->shieldWidget = widget;
+  if (this->shieldWidget != NULL)
+  {
+    this->shieldWidget->show();
+    this->shieldWidget->shiftDir2D(270);
+    this->shipValuesBox->pack(this->shieldWidget);
+    /*    this->shieldWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
+        this->shieldWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
+  }
+
+  this->updateResolution();
+}
 
 void Hud::setArmorWidget(OrxGui::GLGuiWidget* widget)
-{}
+{
+// decopple old widget
+  if (this->armorWidget != NULL)
+  {
+    this->armorWidget->hide();
+  }
+
+  this->armorWidget = widget;
+  if (this->armorWidget != NULL)
+  {
+    this->armorWidget->show();
+    this->armorWidget->shiftDir2D(270);
+    //this->shipValuesBox->pack(this->armorWidget);
+    /*    this->armorWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
+        this->armorWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
+  }
+
+  this->updateResolution();
+}
 
 void Hud::setWeaponManager(WeaponManager* weaponMan, WeaponManager* weaponManSec)
@@ -235 +272 @@
   if (this->shipValuesBox != NULL)
   {
-    this->shipValuesBox->setAbsCoor2D(0.2 * this->resX, 0.85 * this->resY);
+    this->shipValuesBox->setAbsCoor2D(0.8 * this->resX, 0.85 * this->resY);
     this->shipValuesBox->setWidgetSize(.4 * this->resX, 0.1 * this->resY);
   }