From 2672793df4940db55c814caee4ed0ebdea61e49f Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Wed, 1 May 2024 18:07:51 +0200
Subject: [PATCH] give planets a different, smaller marker

---
 assets/models/marker_planets.glb | Bin 0 -> 4876 bytes
 src/commands.rs                  |  30 ++++++++++++------------------
 src/skeleton.rs                  |   1 +
 3 files changed, 13 insertions(+), 18 deletions(-)
 create mode 100644 assets/models/marker_planets.glb

diff --git a/assets/models/marker_planets.glb b/assets/models/marker_planets.glb
new file mode 100644
index 0000000000000000000000000000000000000000..4837970d133a403e7811d8c9b7c46ed8bbae08a8
GIT binary patch
literal 4876
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

literal 0
HcmV?d00001

diff --git a/src/commands.rs b/src/commands.rs
index 0cddf8c..585fafd 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -68,6 +68,7 @@ struct ParserState {
     is_targeted_on_startup: bool,
     is_sun: bool,
     is_moon: bool,
+    is_planet: bool,
     is_point_of_interest: bool,
     orbit_distance: Option<f64>,
     orbit_object_id: Option<String>,
@@ -122,6 +123,7 @@ impl Default for ParserState {
             is_targeted_on_startup: false,
             is_sun: false,
             is_moon: false,
+            is_planet: false,
             is_point_of_interest: false,
             orbit_distance: None,
             orbit_object_id: None,
@@ -290,7 +292,7 @@ pub fn load_defs(
                 state.is_moon = true;
             }
             ["planet", "yes"] => {
-                state.is_moon = true;
+                state.is_planet = true;
             }
             ["sun", "yes"] => {
                 state.is_sun = true;
@@ -761,7 +763,7 @@ fn spawn_entities(
                 skeleton::load(ar_asset_name, &mut entitycmd, &*asset_server);
             }
 
-            if state.is_point_of_interest {
+            if state.is_point_of_interest || state.is_moon || state.is_planet {
                 let mut entitycmd = commands.spawn((
                     hud::PointOfInterestMarker(actor_entity),
                     world::DespawnOnPlayerDeath,
@@ -773,22 +775,14 @@ fn spawn_entities(
                     NotShadowCaster,
                     NotShadowReceiver,
                 ));
-                skeleton::load("point_of_interest", &mut entitycmd, &*asset_server);
-            }
-
-            if state.is_moon {
-                let mut entitycmd = commands.spawn((
-                    hud::PointOfInterestMarker(actor_entity),
-                    world::DespawnOnPlayerDeath,
-                    hud::ToggleableHudElement,
-                    SpatialBundle {
-                        visibility: Visibility::Hidden,
-                        ..default()
-                    },
-                    NotShadowCaster,
-                    NotShadowReceiver,
-                ));
-                skeleton::load("marker_satellites", &mut entitycmd, &*asset_server);
+                let model = if state.is_point_of_interest {
+                    "point_of_interest"
+                } else if state.is_planet {
+                    "marker_planets"
+                } else {
+                    "marker_satellites"
+                };
+                skeleton::load(model, &mut entitycmd, &*asset_server);
             }
 
             if state.has_ring {
diff --git a/src/skeleton.rs b/src/skeleton.rs
index df5269d..f131ff3 100644
--- a/src/skeleton.rs
+++ b/src/skeleton.rs
@@ -46,6 +46,7 @@ pub fn asset_name_to_path(name: &str) -> &'static str {
         "clippy_ar" => "models/clippy/ar_happy.glb#Scene0",
         "whale" => "models/whale.glb#Scene0",
         "marker_satellites" => "models/marker_satellites.glb#Scene0",
+        "marker_planets" => "models/marker_planets.glb#Scene0",
         "point_of_interest" => "models/point_of_interest.glb#Scene0",
         _ => "models/error.glb#Scene0",
     }