Changeset 10759 in orxonox.OLD for branches/presentation

Timestamp:

Jun 21, 2007, 1:52:38 AM (18 years ago)

Author:

bknecht

Message:

hud updated

Location:

branches/presentation/src

Files:

• util/hud.cc (modified) (18 diffs)
• util/hud.h (modified) (1 diff)
• world_entities/weapons/crosshair.cc (modified) (1 diff)
• world_entities/weapons/weapon_manager.cc (modified) (1 diff)

branches/presentation/src/util/hud.cc

@@ -33 +33 @@
 #include "world_entities/space_ships/space_ship.h"
 
+#include "tools/camera.h"
+
+
 
 
@@ -49 +52 @@
 
   //this->setSize2D(
+  this->playmode = Full3D;
   this->weaponManager = NULL;
   this->weaponManagerSecondary = NULL;
@@ -61 +65 @@
   this->rightHit = NULL;
   this->ifinit = true;
+  this->hidden = false;
   
   this->barSocket = NULL;
@@ -192 +197 @@
     this->energyWidget->setParent2D(this->leftRect);
     dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->energyWidget)->setDisplayedImage("textures/gui/gui_electronics_icon.png");
-    this->energyWidget->show();
+    if (!this->hidden)
+        this->energyWidget->show();
+    else
+        this->energyWidget->hide();
     /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
         this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
@@ -221 +229 @@
     this->shieldWidget->setParent2D(this->leftRect);
     dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->shieldWidget)->setDisplayedImage("textures/gui/gui_shield_icon.png");
-    this->shieldWidget->show();
+    if (!this->hidden)
+        this->shieldWidget->show();
+    else
+        this->shieldWidget->hide();
     /*    this->shieldWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
         this->shieldWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
@@ -261 +272 @@
             this->healthWidget->setParent2D(this->leftRect);
             //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->healthWidget)->setDisplayedImage("textures/gui/gui_health_icon.png");
-            this->healthWidget->show();
+            if(!this->hidden)
+                this->healthWidget->show();
+            else
+                this->healthWidget->hide();
             /*    this->healthWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
                 this->healthWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
@@ -291 +305 @@
     this->implantWidget->setParent2D(this->leftRect);
     dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->implantWidget)->setDisplayedImage("textures/gui/gui_electronics_icon.png");
-    this->implantWidget->show();
+    if (!this->hidden)
+        this->implantWidget->show();
+    else
+        this->implantWidget->hide();
     /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
         this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
@@ -409 +426 @@
         else
                 weapon->getEnergyWidget()->setParent2D(this->bottomRect);
-        weapon->getEnergyWidget()->show();
+        if (!this->hidden)
+                weapon->getEnergyWidget()->show();
+        else
+                weapon->getEnergyWidget()->hide();
         weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
         weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
@@ -426 +446 @@
         //PRINTF(0)("WEAPON %s::%s in Slots\n", weapon->getClassCName(), weapon->getName());
         weapon->getEnergyWidget()->setParent2D(this->rightRect);
-        weapon->getEnergyWidget()->show();
+                if (!this->hidden)
+                weapon->getEnergyWidget()->show();
+        else
+                weapon->getEnergyWidget()->hide();
         weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
         weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
@@ -447 +470 @@
 void Hud::getHit()
 {
+        printf("Got hit!\n");
         this->leftHit->show();
         this->rightHit->show();
@@ -463 +487 @@
         }
         if (this->leftHit->isVisible())
+        {
                 hitBarCount -= dt;
-        if (hitBarCount < 0)
+                printf("Reduce visibilty!\n");
+        }
+        if (hitBarCount <= 0)
         {
                 hitBarCount = 0;
                 this->leftHit->hide();
                 this->rightHit->hide();
+                printf("Hide again!\n");
         }
   }
+  //Crosshair* crosshair = dynamic_cast<Crosshair*>(this->weaponManager->getFixedTarget());
+  if ((State::getCamera())->getName() == "GameWorldCamera")
+  {
+        this->hidden = false;
+        if(this->weaponManager)
+                this->weaponManager->showCrosshair();
+  }
+  else
+  {
+        this->hidden = true;
+        if(this->weaponManager)
+                this->weaponManager->hideCrosshair();
+  }
+  this->updateResolution();
 }
 
@@ -518 +560 @@
         this->bottomRect->setWidgetSize(float(this->resX), float(overlayWidth));
         this->bottomRect->setAbsCoor2D(0, this->resY - overlayWidth);
+        //this->bottomRect->show();
         
         this->topRect->setParent2D(this);
         this->topRect->setWidgetSize(float(this->resX), float(overlayWidth));
         this->topRect->setAbsCoor2D(0, 0);
+        //this->topRect->show();
         
         this->middleRect->setParent2D(this);
         this->middleRect->setWidgetSize(float(this->resY)/2, float(this->resY)/2);
         this->middleRect->setAbsCoor2D(float(this->resX)/4, float(this->resY)/4/*float(this->resX/2), float(this->resY/2)*/);
+        //this->middleRect->show();
         
         /*this->bottomHit->setRelCoor2D(0, this->resY/4);
@@ -535 +580 @@
         this->leftHit->setRelCoor2D(0, 0);
         this->leftHit->setWidgetSize(this->resX/9, this->resX/3);
-        this->leftHit->hide();
+        //this->leftHit->hide();
         this->rightHit->setRelCoor2D(this->resX/3, 0);
         this->rightHit->setWidgetSize(this->resX/9, this->resX/3);
-        this->rightHit->hide();
+        //this->rightHit->hide();
 
         this->barSocket->setWidgetSize(overlayWidth, overlayWidth);
         this->barSocket->setRelCoor2D(this->resX - overlayWidth, 0);
-        this->barSocket->show();
+        if (!this->hidden)
+                this->barSocket->show();
+        else
+                this->barSocket->hide();
 
         //this->middleRect->show();
@@ -549 +597 @@
   }
 
-  if (this->overlayActive)
+  if (this->overlayActive && !this->hidden)
   {
     this->rightRect->show();
@@ -574 +622 @@
     this->_radar->setWidgetSize(overlayWidth, overlayWidth);
     this->_radar->setRange(300);
-    this->_radar->show();
+    if (!this->hidden)
+        this->_radar->show();
+    else
+        this->_radar->hide();
     
     int statWidgetsNumber = 0;
@@ -632 +683 @@
                 this->barSocket->setParent2D(this->bottomRect);
                 this->barSocket->setWidgetSize( float(overlayWidth), float(overlayWidth));
-                this->barSocket->setRelCoor2D(0,this->resX - float(overlayWidth));
+                this->barSocket->setRelCoor2D(this->resX - float(overlayWidth),0);
+                this->barSocket->show();
                 
                 this->healthWidget->setRelCoor2D(10,-20);
@@ -681 +733 @@
     (*weaponWidget)->setAbsCoor2D(pos.x + this->rightRect->getAbsCoor2D().x, pos.y);
     //(*weaponWidget)->setAbsCoor2D(0,100);
-    (*weaponWidget)->show();
+    if (!this->hidden)
+        (*weaponWidget)->show();
+    else
+        (*weaponWidget)->hide();
     //printf("update thing %s::%s\n", (*weaponWidget)->getClassCName(), (*weaponWidget)->getName());
   }
@@ -708 +763 @@
     //PRINTF(0)("secweaponwidget y-size: %f/n", (*weaponWidget)->getSizeY2D());
     (*weaponWidget)->setAbsCoor2D(pos.x, pos.y);//+this->rightRect->getAbsCoor2D().x, pos.y);
-    (*weaponWidget)->show();
+    if (!this->hidden)
+        (*weaponWidget)->show();
+    else
+        (*weaponWidget)->hide();
     //printf("update thing %s::%s\n", (*weaponWidget)->getClassCName(), (*weaponWidget)->getName());
   }

branches/presentation/src/util/hud.h

@@ -121 +121 @@
 
   bool                  ifinit;
+  bool                  hidden;
 
   OrxGui::GLGuiWidget*     rightRect;

branches/presentation/src/world_entities/weapons/crosshair.cc

@@ -23 +23 @@
 #include "state.h"
 #include "material.h"
+
+#include "tools/camera.h"
 
 

branches/presentation/src/world_entities/weapons/weapon_manager.cc

@@ -124 +124 @@
 void WeaponManager::showCrosshair()
 {
-  this->crosshair->setVisibility( true);
+  if (this->crosshair)
+        this->crosshair->setVisibility( true);
 }
 
 void WeaponManager::hideCrosshair()
 {
-  this->crosshair->setVisibility( false);
+  if (this->crosshair)
+        this->crosshair->setVisibility( false);
 }