Changeset 10794 for code/branches

Timestamp:

Nov 10, 2015, 7:47:39 PM (9 years ago)

Author:

fvultier

Message:

bug in the WeaponHUD fixed.

Location:

code/branches/fabienHS15

Files:

• data/overlays/jumpHUD.oxo (modified) (1 diff)
• src/modules/overlays/hud/HUDWeapon.cc (modified) (1 diff)
• src/modules/overlays/hud/HUDWeaponMode.cc (modified) (3 diffs)
• src/modules/overlays/hud/HUDWeaponSystem.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/SimpleRocket.cc (modified) (2 diffs)
• src/modules/weapons/weaponmodes/RocketFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (1 diff)
• src/orxonox/weaponsystem/Munition.h (modified) (1 diff)

code/branches/fabienHS15/data/overlays/jumpHUD.oxo

@@ -37 +37 @@
      showFuel = false
      showMessages = true
-    />    
-
-  <HUDBar
-     name          = "SpeedBar1"
-     background    = "Orxonox/BarBackground"
-     size          = "0.35, 0.05"
-     position      = "0.0 , 1.0 "
-     pickpoint     = "0, 1"
-     correctaspect = false
-
-     initialvalue = 50
-
-     >
-      <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
-      <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
-      <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
-    </HUDBar>
+    />
 
   </OverlayGroup>

code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc

@@ -112 +112 @@
     {
         SUPER(HUDWeapon, changedVisibility);
+
+        bool visible = this->isVisible();
+
+        for (std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)
+        {
+            (*it)->setVisible(visible);
+        }
     }
 

code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc

@@ -93 +93 @@
         textOverlayRight_->setZOrder(600);
 
-        materialNameState_ = "Orxonox/WSHUD_Empty";
+        materialNameState_ = "";
 
         overlayElementReplenish_->setMaterialName("Orxonox/WSHUD_Replenish");
@@ -198 +198 @@
 
         this->owner_ = orxonox_cast<Pawn*>(this->getOwner());
+
+        materialNameState_ = ""; // Needed to set the material in the tick ater a change of the owner.
     }
 
@@ -212 +214 @@
         SUPER(HUDWeaponMode, changedVisibility);
 
-        this->textOverlayLeft_->setVisible(this->isVisible());
-        this->textOverlayRight_->setVisible(this->isVisible());
+        bool visible = this->isVisible();
+
+        this->textOverlayLeft_->setVisible(visible);
+        this->textOverlayRight_->setVisible(visible);
+
+        if (visible)
+        {
+            overlayElementIcon_->show();
+            overlayElementReplenish_->show();
+            overlayElementMunition_->show();
+            overlayElementState_->show();
+        }
     }
 

code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc

@@ -100 +100 @@
     {
         SUPER(HUDWeaponSystem, changedVisibility);
+
+        bool visible = this->isVisible();
+
+        for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
+        {
+            (*it)->setVisible(visible);
+        }
     }
 

code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc

@@ -76 +76 @@
             Model* model = new Model(this->getContext());
             model->setMeshSource("rocket.mesh");
-            model->scale(0.7f);
+            model->scale(1.0f);
             this->attach(model);
 
@@ -187 +187 @@
         SUPER(Rocket, tick, dt);
 
+        orxout() << "Rocket::tick" << getScale() << endl;
+
         if( this->hasLocalController() )
         {

code/branches/fabienHS15/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -76 +76 @@
             Model* model = new Model(this->getContext());
             model->setMeshSource("rocket.mesh");
-            model->scale(0.7f);
+            model->scale(1.0f);
             this->attach(model);
 
@@ -116 +116 @@
     {
         SUPER(SimpleRocket, tick, dt);
+
+        orxout() << "SimpleRocket::tick" << getScale() << endl;
 
         if (GameMode::isMaster())

code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -79 +79 @@
         rocket->setPosition(this->getMuzzlePosition());
         rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
-        rocket->scale(2);
+        rocket->scale(1.0f);
 
         rocket->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());

code/branches/fabienHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -85 +85 @@
         rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
         rocket->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+        rocket->scale(1.0f);
 
         rocket->setDamage(this->damage_);

code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h

@@ -43 +43 @@
         enum Value
         {
-            Share,
-            Stack,
-            Separate
+            Separate, // Every comsuming weapon mode has its own magazine. It is possible that one weapon mode is out of ammo while another still has some.
+            Share, // All comsuming weapon modes take their munition from the same magazine. If this magazine is empty a new one is loaded.
+            Stack // There is only one magazine where all the munition is stored. Use this deployment mode for heavy weapons loke rockets, bombs, ...
         };
     }