Context Navigation

Changeset 10842

Timestamp:

Nov 23, 2015, 5:45:13 PM (9 years ago)

Author:

fvultier

Message:

Location:

code/branches/fabienHS15

Files:

r10814	r10842
37	37	linearDamping = 0.7
38	38	angularDamping = 0.9999999
	39
	40	explosionSound = "sounds/Explosion2.ogg"
39	41	>
40	42	<engines>

-                      r10814
+                      r10842
       <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
     </HUDEnemyHealthBar>
+    <HUDEnemyShieldBar
+     name          = "EnemyShieldBar1"
+     background    = "Orxonox/BarBackground"
+     size          = "0.40, 0.04"
+     position      = "1.0 , 0.1 "
+     pickpoint     = "1, 0"
+     correctaspect = true
+     iconmaterial  = "Orxonox/BarIconShield"
+    >
+      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+    </HUDEnemyShieldBar>
     <HUDNavigation

-                      r10814
+                      r10842
     class HUDBoostBar;
     class HUDRocketFuelBar;
+    class HUDEnemyHealthBar;
+    class HUDEnemyShieldBar;
+    class HUDWeaponSystem;
+    class HUDWeapon;
+    class HUDWeaponMode;
     class HUDTimer;
     class HUDAimAssistant;

r10746	r10842
54	54	if (this->owner_)
55	55	{
56		float maxShieldHealth = this->owner_->getShieldHealth();
	56	float maxShieldHealth = this->owner_->getMaxShieldHealth();
57	57	float shieldHealth = this->owner_->getShieldHealth();
58	58
…	…
66	66	}
67	67	}
	68	else
	69	{
	70	this->setValue(0.0f);
	71	}
68	72	}
69	73

r10746	r10842
52	52	virtual void changedOwner();
53	53
	54	inline void setShieldBarOwner(Pawn* owner)
	55	{ this->owner_ = owner; }
54	56	private:
55	57	Pawn* owner_;

Note: See TracChangeset for help on using the changeset viewer.