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

Merge branch 'healthbar-rendering-when-less-than-full' into 'master'

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

Closes #123

See merge request veloren/veloren!195

Former-commit-id: 70607acd77d14b911574d328332f341e5f395b24
This commit is contained in:
Joshua Barretto 2019-05-28 20:37:37 +00:00
commit 5b5cd7d341
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
voxygen/src/hud/mod.rs
View File

@ -308,6 +308,8 @@ impl Hud {
let mut name_id_walker = self.ids.name_tags.walk(); let mut name_id_walker = self.ids.name_tags.walk();
let mut health_id_walker = self.ids.health_bars.walk(); let mut health_id_walker = self.ids.health_bars.walk();
let mut health_back_id_walker = self.ids.health_bar_backs.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()) for (pos, name) in (&entities, &pos, &actor, &stats, player.maybe())
.join() .join()
.filter(|(entity, _, _, stats, _)| *entity != me && !stats.is_dead) .filter(|(entity, _, _, stats, _)| *entity != me && !stats.is_dead)
@ -316,7 +318,7 @@ impl Hud {
name: char_name, .. name: char_name, ..
} => { } => {
// Temporary // 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" { let name = if char_name == "Character Name" {
player.map_or(char_name, |p| &p.alias) player.map_or(char_name, |p| &p.alias)
} else { } else {
@ -339,9 +341,15 @@ impl Hud {
.set(id, ui_widgets); .set(id, ui_widgets);
} }
for (entity, pos, stats) in (&entities, &pos, &stats) // Render Health Bars
.join() for (entity, pos, stats) in
.filter(|(entity, _, stats)| *entity != me && !stats.is_dead) (&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( let back_id = health_back_id_walker.next(
&mut self.ids.health_bar_backs, &mut self.ids.health_bar_backs,
@ -351,14 +359,14 @@ impl Hud {
&mut self.ids.health_bars, &mut self.ids.health_bars,
&mut ui_widgets.widget_id_generator(), &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)) Rectangle::fill_with([120.0, 8.0], Color::Rgba(0.3, 0.3, 0.3, 0.5))
.x_y(0.0, -25.0) .x_y(0.0, -25.0)
.position_ingame(pos.0 + Vec3::new(0.0, 0.0, 3.0)) .position_ingame(pos.0 + Vec3::new(0.0, 0.0, 3.0))
.resolution(100.0) .resolution(100.0)
.set(back_id, ui_widgets); .set(back_id, ui_widgets);
// Filling // % HP Filling
Rectangle::fill_with( Rectangle::fill_with(
[ [
120.0 * (stats.hp.get_current() as f64 / stats.hp.get_maximum() as f64), 120.0 * (stats.hp.get_current() as f64 / stats.hp.get_maximum() as f64),