From 310be85e05c2fe785c374bad3014abd86c763d51 Mon Sep 17 00:00:00 2001 From: hut Date: Sun, 28 Apr 2024 03:15:20 +0200 Subject: [PATCH] add better reticule, properly toggle visibility --- assets/sprites/reticule4.png | Bin 0 -> 3910 bytes media/reticule4.svg | 92 +++++++++++++++++++++++++++++++++++ src/hud.rs | 27 +++++----- 3 files changed, 107 insertions(+), 12 deletions(-) create mode 100644 assets/sprites/reticule4.png create mode 100644 media/reticule4.svg diff --git a/assets/sprites/reticule4.png b/assets/sprites/reticule4.png new file mode 100644 index 0000000000000000000000000000000000000000..a166aaade506abc699158664cc73d2c7f18c3742 GIT binary patch literal 3910 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 literal 0 HcmV?d00001 diff --git a/media/reticule4.svg b/media/reticule4.svg new file mode 100644 index 0000000..f15a258 --- /dev/null +++ b/media/reticule4.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + diff --git a/src/hud.rs b/src/hud.rs index b0db0af..907e810 100644 --- a/src/hud.rs +++ b/src/hud.rs @@ -290,28 +290,31 @@ fn setup( }); // Add Reticule - let reticule_handle: Handle = asset_server.load("sprites/reticule3.png"); - commands.spawn(NodeBundle { - style: Style { - width: Val::Percent(100.0), - height: Val::Percent(100.0), - align_items: AlignItems::Center, - justify_content: JustifyContent::SpaceAround, + let reticule_handle: Handle = asset_server.load("sprites/reticule4.png"); + commands.spawn(( + NodeBundle { + style: Style { + width: Val::Percent(100.0), + height: Val::Percent(100.0), + align_items: AlignItems::Center, + justify_content: JustifyContent::SpaceAround, + ..default() + }, + visibility, ..default() }, - ..default() - }).with_children(|builder| { + ToggleableHudElement, + )).with_children(|builder| { builder.spawn(( ImageBundle { image: UiImage::new(reticule_handle), style: Style { - width: Val::VMin(3.0), - height: Val::VMin(3.0), + width: Val::VMin(5.0), + height: Val::VMin(5.0), ..Default::default() }, ..Default::default() }, - ToggleableHudElement, Reticule, )); });