Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only render other player's healthbars when less than 100% full

Browse Source 
Implements part of 


Former-commit-id: d927d153a39b016d029587351eeb5fa87ccb5197
This commit is contained in:
JMS 2019-05-28 15:26:11 -04:00
parent 8133e3a187
commit 3bcf329811
1 changed files with 14 additions and 6 deletions

20
voxygen/src/hud/mod.rs

@ -307,6 +307,8 @@ impl Hud {
let mut name_id_walker = self.ids.name_tags.walk();
let mut health_id_walker = self.ids.health_bars.walk();
let mut health_back_id_walker = self.ids.health_bar_backs.walk();
// Render Name Tags
for (pos, name) in (&entities, &pos, &actor, &stats, player.maybe())
.join()
.filter(|(entity, _, _, stats, _)| *entity != me && !stats.is_dead)
@ -315,7 +317,7 @@ impl Hud {
name: char_name, ..
} => {
// Temporary
// If the player used the default character name display thier name instead
// If the player used the default character name display their name instead
let name = if char_name == "Character Name" {
player.map_or(char_name, |p| &p.alias)
} else {
@ -338,9 +340,15 @@ impl Hud {
.set(id, ui_widgets);
}
for (entity, pos, stats) in (&entities, &pos, &stats)
.join()
.filter(|(entity, _, stats)| *entity != me && !stats.is_dead)
// Render Health Bars
for (entity, pos, stats) in
(&entities, &pos, &stats)
.join()
.filter(|(entity, _, stats)| {
*entity != me
&& !stats.is_dead
&& stats.hp.get_current() != stats.hp.get_maximum()
})
{
let back_id = health_back_id_walker.next(
&mut self.ids.health_bar_backs,
@ -350,14 +358,14 @@ impl Hud {
&mut self.ids.health_bars,
&mut ui_widgets.widget_id_generator(),
);
// Health Bar
// Background
Rectangle::fill_with([120.0, 8.0], Color::Rgba(0.3, 0.3, 0.3, 0.5))
.x_y(0.0, -25.0)
.position_ingame(pos.0 + Vec3::new(0.0, 0.0, 3.0))
.resolution(100.0)
.set(back_id, ui_widgets);
// Filling
// % HP Filling
Rectangle::fill_with(
[
120.0 * (stats.hp.get_current() as f64 / stats.hp.get_maximum() as f64),