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

Timestamp:

Jan 8, 2007, 9:19:39 PM (18 years ago)

Author:

muellmic

Message:

implementing interface 'by hand' without still buggy packing-function. can't test with spaceship because of segfault

Location:

branches/playability/src/util

Files:

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

branches/playability/src/util/hud.cc

@@ -65 +65 @@
   this->subscribeEvent(ES_ALL, SDLK_TAB);
 
-  this->shipValuesBox = NULL;
+  //this->shipValuesBox = NULL;
 }
 
@@ -78 +78 @@
 
   delete this->_radar;
-  delete this->shipValuesBox;
+  //if (this->shipValuesBox != NULL)
+    //delete this->shipValuesBox;
 
   // delete what has to be deleted here
@@ -99 +100 @@
 void Hud::setEnergyWidget(OrxGui::GLGuiWidget* widget)
 {
-  if (this->shipValuesBox == NULL)
-    this->createShipValuesBox();
+  //if (this->shipValuesBox == NULL)
+    //this->createShipValuesBox();
+
   // decopple old widget
   if (this->energyWidget != NULL)
@@ -111 +113 @@
   {
     //this->energyWidget->shiftDir2D(270);
-    dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->energyWidget)->setDisplayedName("Electronics");
-    this->shipValuesBox->pack(this->energyWidget);
+    //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->energyWidget)->setDisplayedName("Electronics");
+    //this->shipValuesBox->pack(this->energyWidget);
     this->energyWidget->show();
     /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -123 +125 @@
 void Hud::setShiledWidget(OrxGui::GLGuiWidget* widget)
 {
+  /*
   if (this->shipValuesBox == NULL)
     this->createShipValuesBox();
+  */
+
   // decopple old widget
   if (this->shieldWidget != NULL)
@@ -135 +140 @@
   {
     //this->shieldWidget->shiftDir2D(270);
-    this->shipValuesBox->pack(this->shieldWidget);
+    //this->shipValuesBox->pack(this->shieldWidget);
     this->shieldWidget->show();
     /*    this->shieldWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -148 +153 @@
 void Hud::setArmorWidget(OrxGui::GLGuiWidget* widget)
 {
+  /*
   if (this->shipValuesBox == NULL)
     this->createShipValuesBox();
+  */
 
 // decopple old widget
@@ -161 +168 @@
   {
     //this->armorWidget->shiftDir2D(270);
-    this->shipValuesBox->pack(this->armorWidget);
+    //this->shipValuesBox->pack(this->armorWidget);
     this->armorWidget->show();
     /*    this->armorWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -277 +284 @@
     this->_radar->setRange(300);
     this->_radar->show();
-  }
-
-  
+
+    if (this->armorWidget != NULL)
+      this->armorWidget->setRelCoor2D(0.1*this->resX, this->armorWidget->getSizeX2D());
+    if (this->shieldWidget != NULL)
+      this->shieldWidget->setRelCoor2D(0.1*this->resX + this->armorWidget->getSizeY2D(), this->armorWidget->getSizeX2D());
+    if (this->energyWidget != NULL)
+      this->energyWidget->setRelCoor2D(0.1*this->resX + this->armorWidget->getSizeY2D() + this->shieldWidget->getSizeY2D(), this->armorWidget->getSizeX2D());
+    //this->shieldWidget->setRelCoor2D(0.1*this->resX + this->armorWidget->getSizeX2D(),0);
+    //this->energyWidget->setRelCoor2D(0.1*this->resX + this->armorWidget->getSizeX2D() + this->shieldWidget->getSizeX2D(),0);
+  }
+
+  /*
   if (this->shipValuesBox != NULL)
   {
@@ -287 +303 @@
   else
     createShipValuesBox();
-
+  */
 
   std::list<OrxGui::GLGuiWidget*>::iterator weaponWidget;
@@ -323 +339 @@
 }
 
+/*
 void Hud::createShipValuesBox()
 {
-  this->shipValuesBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
+  this->shipValuesBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
   //this->shipValuesBox->setWidgetSize(1000,500);
   //this->shipValuesBox->setBackgroundTexture("maps/gui_container_background.png");
@@ -332 +349 @@
   this->shipValuesBox->setVisibility(true);
 }
-
-
+*/
+
+

branches/playability/src/util/hud.h

@@ -59 +59 @@
   private:
     void updateResolution();
-    void createShipValuesBox();
+    //void createShipValuesBox();
 
 private:
@@ -68 +68 @@
   OrxGui::GLGuiWidget*     shieldWidget;
   OrxGui::GLGuiWidget*     armorWidget;
-  OrxGui::GLGuiBox*        shipValuesBox;
+  //OrxGui::GLGuiBox*        shipValuesBox;
 
   OrxGui::GLGuiNotifier*   notifier;