diff --git a/assets/models/marker_satellites.glb b/assets/models/marker_satellites.glb new file mode 100644 index 0000000..1cf89bd Binary files /dev/null and b/assets/models/marker_satellites.glb differ 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", }