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

Timestamp:

Dec 22, 2006, 12:21:38 AM (18 years ago)

Author:

muellmic

Message:

trying to adjust interface

Location:

branches/playability/src/util

Files:

• hud.cc (modified) (10 diffs)
• hud.h (modified) (2 diffs)

branches/playability/src/util/hud.cc

@@ -65 +65 @@
   this->subscribeEvent(ES_ALL, SDLK_TAB);
 
-  this->shipValuesBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
-  this->shipValuesBox->setBackgroundTexture("maps/gui_container_background.png");
+  this->shipValuesBox = NULL;
 }
 
@@ -79 +78 @@
 
   delete this->_radar;
+  delete this->shipValuesBox;
+
   // delete what has to be deleted here
 }
@@ -98 +99 @@
 void Hud::setEnergyWidget(OrxGui::GLGuiWidget* widget)
 {
+  if (this->shipValuesBox == NULL)
+    this->createShipValuesBox();
   // decopple old widget
   if (this->energyWidget != NULL)
@@ -107 +110 @@
   if (this->energyWidget != NULL)
   {
-    this->energyWidget->show();
-    this->energyWidget->shiftDir2D(270);
+    //this->energyWidget->shiftDir2D(270);
     dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->energyWidget)->setDisplayedName("Electronics");
     this->shipValuesBox->pack(this->energyWidget);
+    this->energyWidget->show();
     /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
         this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
@@ -120 +123 @@
 void Hud::setShiledWidget(OrxGui::GLGuiWidget* widget)
 {
+  if (this->shipValuesBox == NULL)
+    this->createShipValuesBox();
   // decopple old widget
   if (this->shieldWidget != NULL)
@@ -129 +134 @@
   if (this->shieldWidget != NULL)
   {
+    //this->shieldWidget->shiftDir2D(270);
+    this->shipValuesBox->pack(this->shieldWidget);
     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);*/
   }
+  else
+    printf("schild im hud nicht uebergeben!!!!!!!!!!!!!!!!!!!!!!!!!");
 
   this->updateResolution();
@@ -141 +148 @@
 void Hud::setArmorWidget(OrxGui::GLGuiWidget* widget)
 {
+  if (this->shipValuesBox == NULL)
+    this->createShipValuesBox();
+
 // decopple old widget
   if (this->armorWidget != NULL)
@@ -150 +160 @@
   if (this->armorWidget != NULL)
   {
+    //this->armorWidget->shiftDir2D(270);
+    this->shipValuesBox->pack(this->armorWidget);
     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);*/
@@ -272 +282 @@
   if (this->shipValuesBox != NULL)
   {
-    this->shipValuesBox->setAbsCoor2D(0.8 * this->resX, 0.85 * this->resY);
+    this->shipValuesBox->setAbsCoor2D(0.2 * this->resX, 0.4 * this->resY);
     this->shipValuesBox->setWidgetSize(.4 * this->resX, 0.1 * this->resY);
   }
+  else
+    createShipValuesBox();
 
 
@@ -309 +321 @@
   //  this->inputLine->select();
   }
-
-
-}
-
-
+}
+
+void Hud::createShipValuesBox()
+{
+  this->shipValuesBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
+  //this->shipValuesBox->setWidgetSize(1000,500);
+  //this->shipValuesBox->setBackgroundTexture("maps/gui_container_background.png");
+  this->shipValuesBox->setBackgroundTexture(Texture());
+  this->shipValuesBox->setBackgroundColor(Color(0,0,1,0.5));
+  this->shipValuesBox->setVisibility(true);
+}
+
+

branches/playability/src/util/hud.h

@@ -40 +40 @@
   void setShiledWidget(OrxGui::GLGuiWidget* widget);
   void setArmorWidget(OrxGui::GLGuiWidget* widget);
+  inline OrxGui::GLGuiWidget* getEnergyWidget() {return this->energyWidget;};
+  inline OrxGui::GLGuiWidget* getShieldWidget() {return this->shieldWidget;};
+  inline OrxGui::GLGuiWidget* getArmorWidget() {return this->armorWidget;};
+
   void setWeaponManager(WeaponManager* weaponMan, WeaponManager* weaponManSec = NULL);
 
@@ -55 +59 @@
   private:
     void updateResolution();
+    void createShipValuesBox();
 
 private: