diff --git a/assets/sprites/gauge_battery.png b/assets/sprites/gauge_battery.png new file mode 100644 index 0000000..7c40cd5 Binary files /dev/null and b/assets/sprites/gauge_battery.png differ diff --git a/assets/sprites/gauge_fuel.png b/assets/sprites/gauge_fuel.png new file mode 100644 index 0000000..6a30f90 Binary files /dev/null and b/assets/sprites/gauge_fuel.png differ diff --git a/assets/sprites/gauge_heart.png b/assets/sprites/gauge_heart.png new file mode 100644 index 0000000..7b6b878 Binary files /dev/null and b/assets/sprites/gauge_heart.png differ diff --git a/assets/sprites/gauge_o2.png b/assets/sprites/gauge_o2.png new file mode 100644 index 0000000..47ed7d2 Binary files /dev/null and b/assets/sprites/gauge_o2.png differ diff --git a/assets/sprites/gauge_suit.png b/assets/sprites/gauge_suit.png new file mode 100644 index 0000000..5de1f16 Binary files /dev/null and b/assets/sprites/gauge_suit.png differ diff --git a/src/hud.rs b/src/hud.rs index 1263c66..f7e0162 100644 --- a/src/hud.rs +++ b/src/hud.rs @@ -348,11 +348,13 @@ fn setup( // HP/O2/Suit Integrity/Power Gauges let gauges_handle: Handle = asset_server.load("sprites/gauge_horizontal.png"); let gauges = [ - ("sprites/dashboard_highbeams.png", Gauge::Health), - ("sprites/dashboard_highbeams.png", Gauge::Power), - ("sprites/dashboard_highbeams.png", Gauge::Oxygen), - ("sprites/dashboard_highbeams.png", Gauge::Integrity), + ("sprites/gauge_heart.png", Gauge::Health), + ("sprites/gauge_battery.png", Gauge::Power), + ("sprites/gauge_o2.png", Gauge::Oxygen), + ("sprites/gauge_suit.png", Gauge::Integrity), ]; + let icon_size = 24.0; + let gauge_bar_padding_left = 4.0; for (i, (sprite, gauge)) in gauges.iter().enumerate() { let bar_length = if i == 0 { 196.0 } else { 128.0 }; @@ -380,7 +382,7 @@ fn setup( width: Val::Px(118.0), height: Val::Px(10.0), bottom: Val::Px(8.0), - left: Val::Px(32.0), + left: Val::Px(gauge_bar_padding_left + icon_size), ..Default::default() }, visibility, @@ -410,18 +412,20 @@ fn setup( Dashboard, ToggleableHudElement, )).with_children(|builder| { + // The gauge symbol builder.spawn(( ImageBundle { image: UiImage::new(asset_server.load(sprite.to_string())), style: Style { - width: Val::Px(28.0), - height: Val::Px(28.0), + width: Val::Px(icon_size), + height: Val::Px(icon_size), ..Default::default() }, visibility, ..Default::default() }, )); + // The gauge bar border builder.spawn(( ImageBundle { image: UiImage::new(gauges_handle.clone()), @@ -429,7 +433,7 @@ fn setup( width: Val::Px(bar_length), height: Val::Px(10.0), bottom: Val::Px(8.0), - left: Val::Px(4.0), + left: Val::Px(gauge_bar_padding_left), ..Default::default() }, visibility, diff --git a/src/svg/gauge_battery.svg b/src/svg/gauge_battery.svg new file mode 100644 index 0000000..dd1c801 --- /dev/null +++ b/src/svg/gauge_battery.svg @@ -0,0 +1,99 @@ + + + + diff --git a/src/svg/gauge_fuel.svg b/src/svg/gauge_fuel.svg new file mode 100644 index 0000000..d46b9fb --- /dev/null +++ b/src/svg/gauge_fuel.svg @@ -0,0 +1,90 @@ + + + + diff --git a/src/svg/gauge_heart.svg b/src/svg/gauge_heart.svg new file mode 100644 index 0000000..46f379d --- /dev/null +++ b/src/svg/gauge_heart.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/svg/gauge_o2.svg b/src/svg/gauge_o2.svg new file mode 100644 index 0000000..c7f0853 --- /dev/null +++ b/src/svg/gauge_o2.svg @@ -0,0 +1,91 @@ + + + + diff --git a/src/svg/gauge_suit.svg b/src/svg/gauge_suit.svg new file mode 100644 index 0000000..41bfe9c --- /dev/null +++ b/src/svg/gauge_suit.svg @@ -0,0 +1,95 @@ + + + +