Changeset 10233 in orxonox.OLD for branches

Timestamp:

Jan 11, 2007, 11:42:43 PM (18 years ago)

Author:

muellmic

Message:

energy bars are now changing its colors, adding hud overlay - very strange coordinate behaviour tough, awaiting fix

Location:

branches/playability/src

Files:

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

branches/playability/src/util/hud.cc

@@ -57 +57 @@
   this->resY = 1;
 
-  this->travelZoneWidth = 0.7;
+  this->overlayPercentage = 5;
+  this->overlayActive = false;
+  this->rightRect = NULL;
+  this->leftRect = NULL;
 
   this->inputLine = new OrxGui::GLGuiInputLine();
@@ -83 +86 @@
 
   delete this->_radar;
+  delete this->rightRect;
+  delete this->leftRect;
   //if (this->shipValuesBox != NULL)
     //delete this->shipValuesBox;
@@ -286 +291 @@
   this->notifier->setWidgetSize(0.25 * this->resX, 0.6 * this->resY);
 
+  if (this->overlayActive == true)
+  {
+    if (this->rightRect == NULL)
+      this->rightRect = new OrxGui::GLGuiWidget();
+    //if (this->leftRect == NULL)
+      //this->leftRect = new OrxGui::GLGuiWidget();
+    
+    int overlayWidth = this->resX * (100-overlayPercentage)/(200);
+    this->rightRect->hide();
+    /*
+    this->leftRect->setWidgetSize(float(overlayWidth), float(this->resY));
+    this->leftRect->setAbsCoor2D(0,0);
+    this->leftRect->setBackgroundTexture(Texture());
+    this->leftRect->setBackgroundColor(Color(0,0,0.7,0.2));
+    this->leftRect->show();
+    */
+    
+    
+    this->rightRect->setParent2D(this);
+    this->rightRect->setWidgetSize(float(overlayWidth), float(this->resY));
+    this->rightRect->setAbsCoor2D(this->resX - overlayWidth,this->resY);
+    this->rightRect->setBackgroundTexture(Texture());
+    this->rightRect->setBackgroundColor(Color(0,0,0.7,0.2));
+    //this->rightRect->setForegroundTexture(Texture());
+    //this->rightRect->setForegroundColor(Color(1,1,1,1));
+    this->rightRect->show();
+    
+  }
+
 
   if (State::getPlayer() && State::getPlayer()->getPlayable() && State::getObjectManager())
@@ -349 +383 @@
   }
 
-  //if (this->rightRect == NULL)
-         
 }
 

branches/playability/src/util/hud.h

@@ -54 +54 @@
   void updateWeaponManager();
 
-  inline void setTravelZoneWidth(float width) 
+  inline void setOverlayPercentage(int perc) 
   {
-    if (width > 1) width = 1;
-    else if (width < 0) width = 0;
+    if (perc > 100) perc = 100;
+    else if (perc < 0) perc = 0;
 
-    this->travelZoneWidth = width;
+    this->overlayPercentage = perc;
+    updateResolution();
+  };
+
+  inline void setOverlayActive(bool b)
+  {
+    overlayActive = b;
+    updateResolution();
   };
 
@@ -84 +91 @@
   OrxGui::GLGuiRadar*      _radar;
 
-  OrxGui::GLGuiWidget*     rightRect, leftRect;
+  OrxGui::GLGuiWidget*     rightRect;
+  OrxGui::GLGuiWidget*     leftRect;
+  bool                     overlayActive;
+  int                      overlayPercentage; //the percentage of the screen, the player has got for his movements. should always be a value between 0 and 1;
 
   WeaponManager*           weaponManager;

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

@@ -54 +54 @@
     this->_bar.setValue(value);
     this->_bar.setForegroundColor(Color::slerpHSVColor(Color::red, Color::green, value/this->_bar.maximum()));
-    this->_bar.setFrontColor(Color(1,1,1,1), true);
+    //this->_bar.setFrontColor(Color(1,1,1,1), true);
     this->_valueText.setText(val.getString());
     //this->_valueText.setText("asdfas");

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

@@ -424 +424 @@
   this->secWeaponMan.showCrosshair();
   this->toList( OM_GROUP_01 );
+  State::getPlayer()->hud().setOverlayActive(true);
   //dynamic_cast <OrxGui::GLGuiEnergyWidgetVertical*> (State::getPlayer()->hud().getArmorWidget())->setDisplayedName("Armor");
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( true);
@@ -434 +435 @@
   this->secWeaponMan.hideCrosshair();
   this->toList( OM_GROUP_00);
+  State::getPlayer()->hud().setOverlayActive(false);
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( false);
   //this->detachCamera();