Changeset 10111 in orxonox.OLD

Timestamp:

Dec 19, 2006, 11:32:32 PM (17 years ago)

Author:

muellmic

Message:

placed container for ship values into hud

Location:

branches/playability/src

Files:

• util/hud.cc (modified) (4 diffs)
• util/hud.h (modified) (2 diffs)
• world_entities/elements/glgui_energywidgetvertical.cc (modified) (2 diffs)

branches/playability/src/util/hud.cc

@@ -23 +23 @@
 #include "world_entities/weapons/weapon_manager.h"
 #include "glgui_widget.h"
+#include "glgui_box.h"
 
 #include "glgui_inputline.h"
@@ -63 +64 @@
   this->subscribeEvent(ES_ALL, SDLK_TAB);
 
-
+  this->shipValuesBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
+  this->shipValuesBox->setBackgroundTexture("maps/gui_container_background.png");
 }
 
@@ -105 +107 @@
   {
     this->energyWidget->show();
-    //this->energyWidget->setBackgroundTexture( "hud_energy_background.png");
     this->energyWidget->shiftDir2D(270);
+    //this->energyWidget->setDisplayedName("Electronics")
+    this->shipValuesBox->pack(this->energyWidget);
     /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
         this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
@@ -229 +232 @@
   }
 
-
-  if (this->energyWidget != NULL)
-  {
-    this->energyWidget->setAbsCoor2D(0.2 * this->resX, 0.85 * this->resY);
-    this->energyWidget->setWidgetSize(.25 * this->resX, 0.1 * this->resY);
+  
+  if (this->shipValuesBox != NULL)
+  {
+    this->shipValuesBox->setAbsCoor2D(0.2 * this->resX, 0.85 * this->resY);
+    this->shipValuesBox->setWidgetSize(.4 * this->resX, 0.1 * this->resY);
   }
 

branches/playability/src/util/hud.h

@@ -9 +9 @@
 #include "element_2d.h"
 #include "event_listener.h"
+#include "glgui_box.h"
 
 
@@ -62 +63 @@
   OrxGui::GLGuiWidget*     shieldWidget;
   OrxGui::GLGuiWidget*     armorWidget;
+  OrxGui::GLGuiBox*        shipValuesBox;
 
   OrxGui::GLGuiNotifier*   notifier;

branches/playability/src/world_entities/elements/glgui_energywidgetvertical.cc

@@ -32 +32 @@
 
     this->_bar.setSize2D(100, 30);
+    this->_name.setRelCoor2D(20,0);
+    this->_valueText.setRelCoor2D(22,0);
+
     this->pack(&this->_name);
     this->pack(&this->_valueText);
@@ -38 +41 @@
     this->_name.setForegroundColor(Color(1,1,1,.8));
     this->_valueText.setChangedTextColor(Color::white);
+    this->_bar.setBackgroundTexture(Texture());
 
-    //this->setBackgroundTexture("maps/gui_element_background_2.png");
-    this->setBackgroundColor(Color(.5,.5,.5,1));
+    this->setBackgroundTexture(Texture());
+    this->setBackgroundColor(Color(.5,.5,.5,0));
 
     //this->_name.setBackgroundTexture(Texture());