From fd90c1b2f04fa8cea05d9e9b065a51cfa5acc626 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Wed, 1 May 2024 17:43:16 +0200
Subject: [PATCH] add special point-of-interest markers for moons

---
 assets/models/marker_satellites.glb | Bin 0 -> 4808 bytes
 src/commands.rs                     |  15 +++++++++++++++
 src/data/defs.txt                   |   4 ++++
 src/skeleton.rs                     |   1 +
 4 files changed, 20 insertions(+)
 create mode 100644 assets/models/marker_satellites.glb

diff --git a/assets/models/marker_satellites.glb b/assets/models/marker_satellites.glb
new file mode 100644
index 0000000000000000000000000000000000000000..1cf89bdb1ab3ff6a06eec2dfd784e45badb43553
GIT binary patch
literal 4808
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
UgCo#~vJZAc6{sMh6u}Sw13UR58vp<R

literal 0
HcmV?d00001

diff --git a/src/commands.rs b/src/commands.rs
index 6128834..ff45a34 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -771,6 +771,21 @@ fn spawn_entities(
                 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);
+            }
+
             if state.has_ring {
                 commands.spawn((
                     world::DespawnOnPlayerDeath,
diff --git a/src/data/defs.txt b/src/data/defs.txt
index 44a8705..885937a 100644
--- a/src/data/defs.txt
+++ b/src/data/defs.txt
@@ -205,6 +205,7 @@ actor 0 127093 0 moonlet
     id thebe
     orbit 221900e3 0.34
     scale 50e3
+    moon yes
     angularmomentum 0 0.025 0
     actor -55e3 44e3 0 suitv2
         relativeto thebe
@@ -226,6 +227,7 @@ actor 0 0 0 moonlet
     id metis
     orbitaround jupiter 128000e3
     scale 21.5e3
+    moon yes
     angularmomentum 0 0.025 0
 
 actor 0 0 0 moonlet
@@ -234,6 +236,7 @@ actor 0 0 0 moonlet
     id adrastea
     orbitaround jupiter 129000e3
     scale 8.2e3
+    moon yes
     angularmomentum 0 0.025 0
 
 actor 0 0 0 moonlet
@@ -242,6 +245,7 @@ actor 0 0 0 moonlet
     id amalthea
     orbitaround jupiter 181365.84e3
     scale 83.5e3
+    moon yes
     angularmomentum 0 0.025 0
 
 actor 5000 0 -3000 moonlet
diff --git a/src/skeleton.rs b/src/skeleton.rs
index 08d58ba..df5269d 100644
--- a/src/skeleton.rs
+++ b/src/skeleton.rs
@@ -45,6 +45,7 @@ pub fn asset_name_to_path(name: &str) -> &'static str {
         "clippy" => "models/clippy/clippy.glb#Scene0",
         "clippy_ar" => "models/clippy/ar_happy.glb#Scene0",
         "whale" => "models/whale.glb#Scene0",
+        "marker_satellites" => "models/marker_satellites.glb#Scene0",
         "point_of_interest" => "models/point_of_interest.glb#Scene0",
         _ => "models/error.glb#Scene0",
     }