From d1d0eac44d892e9b045fbaa20b58735c18e0b793 Mon Sep 17 00:00:00 2001
From: Johannes Hendrik Gerard van der Weide <hertog@fsfe.org>
Date: Thu, 11 Jan 2024 19:35:22 +0100
Subject: [PATCH] Joystick sprite done

---
 assets/circle_empty.png                     | Bin 0 -> 146 bytes
 assets/circle_full.png                      | Bin 0 -> 136 bytes
 data/settings/{settings.yml => default.yml} |   3 +-
 src/main.rs                                 |  29 +++++++++++++++++---
 4 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 assets/circle_empty.png
 create mode 100644 assets/circle_full.png
 rename data/settings/{settings.yml => default.yml} (72%)

diff --git a/assets/circle_empty.png b/assets/circle_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2bf2c3d5d3949cdf010dca0e5833ff5fffcf4ba
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;OS+@4BLl<6e(pbstUx|nfKP}k
zkpBPw|I(ZD?*dtjB|(0{3=Yq3qyafvo-U3d9M_W*fS~?>!vE%j$J!1yv@dMvS8U{M
mY=~K)5Wuy9VMR|PBg4KQ>_2y|oIDSxi^0>?&t;ucLK6UQXe|o>

literal 0
HcmV?d00001

diff --git a/assets/circle_full.png b/assets/circle_full.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7832b4e4a15f3715be675d8f6c6c241c502616b
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;OS+@4BLl<6e(pbstUx|nfKP}k
zkpBPw|I(ZD?*dtjB|(0{3=Yq3qyae!o-U3d9M_W*7?__i^Zb#Qcv9am;jcVPQwPJ+
d2Cf4P40=;}&ayE5dks{};OXk;vd$@?2>?6_B=7(L

literal 0
HcmV?d00001

diff --git a/data/settings/settings.yml b/data/settings/default.yml
similarity index 72%
rename from data/settings/settings.yml
rename to data/settings/default.yml
index 48949c8..1c2e14b 100644
--- a/data/settings/settings.yml
+++ b/data/settings/default.yml
@@ -4,7 +4,8 @@
         down: S
         left: A
         right: D
-        input_sprite_path: neocat.png
+        input_lower_sprite_path: circle_empty.png
+        input_upper_sprite_path: circle_full.png
         input_sprite_size: [
             30.0,
             30.0
diff --git a/src/main.rs b/src/main.rs
index 6653196..e049502 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,7 +12,8 @@ pub struct Settings {
     pub down: String,
     pub left: String,
     pub right: String,
-    pub input_sprite_path: String,
+    pub input_lower_sprite_path: String,
+    pub input_upper_sprite_path: String,
     pub input_sprite_size: Vec2,
     pub input_sprite_location: Vec2,
 }
@@ -60,7 +61,8 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
         down: S
         left: A
         right: D
-        input_sprite_path: neocat.png
+        input_lower_sprite_path: circle_empty.png
+        input_upper_sprite_path: circle_full.png
         input_sprite_size: [
             30.0,
             30.0
@@ -76,7 +78,26 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     
     let settings_data =
         serde_yaml::from_str::<Settings>(&settings_yaml[0]).expect("Error serializing to YAML");
-
+    commands.spawn(
+        SpriteBundle {
+            sprite: Sprite {
+                custom_size: Some(Vec2::new(
+                    settings_data.input_sprite_size.x,
+                    settings_data.input_sprite_size.y,
+                )),
+                anchor: 
+                    bevy::sprite::Anchor::Custom(Vec2::new(
+                        6.658,
+                        6.658,
+                    )),    
+                
+                ..default()
+            },
+            texture: asset_server.load(settings_data.input_lower_sprite_path),
+            ..default()
+            
+        }
+    );
     commands.spawn((
         SpriteBundle {
             sprite: Sprite {
@@ -86,7 +107,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                 )),
                 ..default()
             },
-            texture: asset_server.load(settings_data.input_sprite_path),
+            texture: asset_server.load(settings_data.input_upper_sprite_path),
             ..default()
         },
         InputVisual {