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

Timestamp:

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

Author:

muellmic

Message:

trying to adjust interface

Location:

branches/playability/src/world_entities

Files:

• elements/glgui_energywidgetvertical.cc (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (4 diffs)
• world_entity.cc (modified) (1 diff)

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();