Changeset 10139 in orxonox.OLD

Timestamp:

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

Author:

muellmic

Message:

trying to adjust interface

Location:

branches/playability/src

Files:

• lib/gui/gl/glgui_bar.cc (modified) (2 diffs)
• lib/gui/gl/glgui_box.cc (modified) (4 diffs)
• util/hud.cc (modified) (10 diffs)
• util/hud.h (modified) (2 diffs)
• world_entities/elements/glgui_energywidgetvertical.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (4 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

branches/playability/src/lib/gui/gl/glgui_bar.cc

@@ -71 +71 @@
 
     this->_value = value;
-    this->_frontRect.setSize((this->getSizeX2D() - borderLeft() - borderRight()) * (_value -_minimum)/ (_minimum + _maximum)
+    this->_frontRect.setSize((this->getSizeX2D() - borderLeft() - borderRight()) * (_value - _minimum) / (_maximum -_minimum)
         ,this->getSizeY2D() - borderTop() - borderBottom());
   }
@@ -99 +99 @@
 
     this->_frontRect.setTopLeft(borderLeft(), borderTop());
-    this->_frontRect.setSize((this->getSizeX2D() - borderLeft() - borderRight()) * (_value -_minimum)/ (_minimum + _maximum)
-                             ,this->getSizeY2D() - borderTop() - borderBottom());
+    this->_frontRect.setSize((this->getSizeX2D() - borderLeft() - borderRight()) * (_value - _minimum) / (_maximum -_minimum)
+        ,this->getSizeY2D() - borderTop() - borderBottom());
 
   }

branches/playability/src/lib/gui/gl/glgui_box.cc

@@ -18 +18 @@
 #include "glgui_box.h"
 #include <cassert>
+#include <iostream>
 #include "debug.h"
+#include "network_log.h"
 
 namespace OrxGui
@@ -177 +179 @@
   void GLGuiBox::resize()
   {
-    if (orientation() == OrxGui::Vertical)
+    if (this->orientation() == OrxGui::Vertical)
     {
       float height = borderTop();
@@ -186 +188 @@
       for (widget = this->_children.begin(); widget != this->_children.end(); ++widget)
       {
-        (*widget)->setRelCoor2D(borderLeft(), height);
-        height += (*widget)->getSizeY2D();
-        width = fmax(width, (*widget)->getSizeX2D());
+        float radDir = (*widget)->getAbsDir2D() * 2 * M_PI / 360;
+        float realSizeX = fabsf((*widget)->getSizeX2D() * cosf(radDir)) + fabsf((*widget)->getSizeY2D() * sinf(radDir));
+        float realSizeY = fabsf((*widget)->getSizeX2D() * sinf(radDir)) + fabsf((*widget)->getSizeY2D() * cosf(radDir));
+
+        (*widget)->setRelCoor2D(borderLeft(), height + borderTop());
+        height += realSizeY;
+        width = fmax(width, realSizeX);
       }
 
@@ -205 +211 @@
       for (widget = this->_children.begin(); widget != this->_children.end(); ++widget)
       {
+        float radDir = (*widget)->getAbsDir2D() * 2 * M_PI / 360;
+        //std::cout << "size X: " << (*widget)->getSizeX2D() << "size Y: " << (*widget)->getSizeY2D() << '\n';
+        float realSizeX = fabsf((*widget)->getSizeX2D() * cosf(radDir)) + fabsf((*widget)->getSizeY2D() * sinf(radDir));
+        float realSizeY = fabsf((*widget)->getSizeX2D() * sinf(radDir)) + fabsf((*widget)->getSizeY2D() * cosf(radDir));
+
         (*widget)->setRelCoor2D(width, borderTop());
-        height = fmax(height, (*widget)->getSizeY2D());
-        width += (*widget)->getSizeX2D();
+        height = fmax(height, realSizeY);
+        width += realSizeX;
       }
 

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:

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

@@ -29 +29 @@
     //   this->setClassID(CL_PROTO_ID, "GLGuiEnergyWidget");
 
-    
-
-    this->_bar.setSize2D(100, 30);
-    this->_name.setRelCoor2D(200,0);
-    this->_valueText.setRelCoor2D(22,0);
-
+    //this->_bar.setSize2D(100, 30);
+    //this->_bar.setRelCoor2D(-10,0);
+    //this->_name.setRelCoor2D(20,0);
+    //this->_valueText.setRelCoor2D(,0);
+    this->shiftDir2D(270);
+    this->setOrientation(OrxGui::Horizontal);
     this->pack(&this->_name);
     this->pack(&this->_valueText);
@@ -44 +44 @@
 
     this->setBackgroundTexture(Texture());
-    this->setBackgroundColor(Color(.5,.5,.5,0));
+    this->setBackgroundColor(Color(.5,.5,.5,0.5));
 
     //this->_name.setBackgroundTexture(Texture());

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -232 +232 @@
 
   // widget handling
+  /*
   this->electronicWidget = new OrxGui::GLGuiEnergyWidgetVertical();
   this->electronicWidget->setDisplayedName(std::string(this->getClassName()) + " Electronics:");
@@ -249 +250 @@
     State::getPlayer()->hud().setEnergyWidget(this->electronicWidget);
   }
+  */
+  this->electronicWidget = NULL;
+  this->shieldWidget = NULL;
 
   //add events to the eventlist
@@ -392 +396 @@
   this->secWeaponMan.showCrosshair();
   this->toList( OM_GROUP_01 );
+  dynamic_cast <OrxGui::GLGuiEnergyWidgetVertical*> (State::getPlayer()->hud().getArmorWidget())->setDisplayedName("Armor");
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( true);
   //this->attachCamera();
@@ -1014 +1019 @@
 void SpaceShip::updateElectronicWidget()
 {
-  this->electronicWidget->setMaximum(this->electronicMax);
-  this->electronicWidget->setValue(this->electronicCur);
-  if (this->hasPlayer())
-    this->electronicWidget->show();
+  if (this->electronicWidget != NULL)
+  { //if it exists already: update it
+     this->electronicWidget->setMaximum(this->electronicMax);
+     this->electronicWidget->setValue(this->electronicCur);
+  }
+  else
+  { //create the widget
+    this->electronicWidget = new OrxGui::GLGuiEnergyWidgetVertical();
+    this->electronicWidget->setDisplayedName("Electronics:");
+    //this->electronicWidget->setSize2D(100,20);
+    //this->electronicWidget->setAbsCoor2D(150,200);
+    this->updateElectronicWidget();
+    if (this->hasPlayer())
+      State::getPlayer()->hud().setEnergyWidget(this->electronicWidget);
+  }
 }
 
 void SpaceShip::updateShieldWidget()
 {
-  this->shieldWidget->setMaximum(this->shieldMax);
-  this->shieldWidget->setValue(this->shieldCur);
-  if (this->hasPlayer())
-    this->shieldWidget->show();
-}
+  if (this->shieldWidget != NULL)
+  { 
+    this->shieldWidget->setMaximum(this->shieldMax);
+    this->shieldWidget->setValue(this->shieldCur);;
+  }
+  else
+  {
+    this->shieldWidget = new OrxGui::GLGuiEnergyWidgetVertical();
+    this->shieldWidget->setDisplayedName("Shield:");
+    //his->shieldWidget->setSize2D(100,20);
+    //this->shieldWidget->setAbsCoor2D(200,200);
+    this->updateShieldWidget();
+    if (this->hasPlayer())
+      State::getPlayer()->hud().setShiledWidget(this->shieldWidget);
+  }
+}

branches/playability/src/world_entities/world_entity.cc

@@ -752 +752 @@
   {
     this->healthWidget = new OrxGui::GLGuiEnergyWidgetVertical();
-    this->healthWidget->setDisplayedName("Electronics");
-    this->healthWidget->setSize2D(30,400);
-    this->healthWidget->setAbsCoor2D(100,200);
+    this->healthWidget->setDisplayedName("Health");
+    //this->healthWidget->setSize2D(100,20);
+    //this->healthWidget->setAbsCoor2D(100,200);
 
     this->updateHealthWidget();