Updated status bar

Author: Aunmag

assets/shader/status_bar.wgsl

@@ -2,6 +2,7 @@
 
 const RANGE = 0.75;
 const COLOR_VOID = vec4<f32>(0.0, 0.0, 0.0, 0.333333);
+const COLOR_STAMINA = vec4<f32>(0.8, 0.8, 0.8, 0.4);
 const COLOR_HEALTH = vec4<f32>(1.0, 0.0, 0.0, 0.6);
 const COLOR_AMMO = vec4<f32>(0.8, 0.8, 0.8, 0.4);
 
@@ -10,6 +11,7 @@ struct Uniform {
     health_alpha: f32,
     ammo: f32,
     ammo_alpha: f32,
+    stamina: f32,
 };
 
 @group(1) @binding(0)
@@ -75,8 +77,9 @@ fn bar(value: f32, center: vec2<f32>, color: vec4<f32>, radius: f32, thickness:
 fn fragment(
     #import bevy_sprite::mesh2d_vertex_output
 ) -> @location(0) vec4<f32> {
-    var center = uv.xy - 0.5;
-    var health = bar(uniform.health, center, mix_alpha(COLOR_HEALTH, uniform.health_alpha), 0.85, 0.05);
-    var ammo   = bar(uniform.ammo  , center, mix_alpha(COLOR_AMMO  , uniform.ammo_alpha  ), 1.00, 0.03);
-    return vec4<f32>(health + ammo);
+    var center  = uv.xy - 0.5;
+    var stamina = bar(uniform.stamina, center, mix_alpha(COLOR_STAMINA, 1.0                 ), 0.62, 0.01);
+    var health  = bar(uniform.health , center, mix_alpha(COLOR_HEALTH , uniform.health_alpha), 0.91, 0.06);
+    var ammo    = bar(uniform.ammo   , center, mix_alpha(COLOR_AMMO   , uniform.ammo_alpha  ), 1.00, 0.01);
+    return vec4<f32>(stamina + health + ammo);
 }

src/command/status_bar_set.rs

@@ -29,6 +29,7 @@ impl Command for StatusBarSet {
                 health_alpha: 0.0,
                 ammo: 1.0,
                 ammo_alpha: 0.0,
+                stamina: 0.0,
                 image,
             });
 

src/material/status_bar.rs

@@ -16,6 +16,8 @@ pub struct StatusBarMaterial {
     pub ammo: f32,
     #[uniform(0)]
     pub ammo_alpha: f32,
+    #[uniform(0)]
+    pub stamina: f32,
     #[texture(1)]
     #[sampler(2)]
     pub image: Handle<Image>,

src/system/game/status_bar.rs

@@ -1,5 +1,5 @@
 use crate::{
-    component::{Health, Weapon},
+    component::{Actor, Health, Weapon},
     StatusBarMaterial,
 };
 use bevy::{
@@ -13,15 +13,15 @@ const INTERPOLATION: f32 = 8.0;
 const PULSE: Duration = Duration::from_millis(500);
 
 pub fn status_bar(
-    targets: Query<(&Health, Option<&Weapon>, &Children)>, // TODO: try to simplify
+    targets: Query<(&Actor, &Health, Option<&Weapon>, &Children)>, // TODO: try to simplify
     handles: Query<&Handle<StatusBarMaterial>>,
     mut assets: ResMut<Assets<StatusBarMaterial>>,
     time: Res<Time>,
 ) {
     let pulse = (time.elapsed_seconds() * TAU / PULSE.as_secs_f32()).cos() / 2.0 + 0.5;
     let interpolation = f32::min(INTERPOLATION * time.delta().as_secs_f32(), 1.0);
 
-    for (health, weapon, children) in targets.iter() {
+    for (actor, health, weapon, children) in targets.iter() {
         for child in children.iter() {
             if let Some(material) = handles.get(*child).ok().and_then(|h| assets.get_mut(h)) {
                 material.health -= (material.health - health.get()) * interpolation;
@@ -43,6 +43,8 @@ pub fn status_bar(
                 } else {
                     material.ammo_alpha = 0.0;
                 }
+
+                material.stamina = actor.stamina;
             }
         }
     }