add The Moon™

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Add sparkles to Jupiter's ring ✨😍✨ best visible from Farview Station
 - Add oxygen tank near Luna's workshop, refills oxygen on interaction
 - Add new avatars for Augmented Reality: Cat Ears, Skirt
+- Add The Moon™
 
 # v0.12.0
 

LICENSE.md

@@ -10,6 +10,10 @@
     - Earth: By Yuni, CC0 License. A simple addition of
         - [base image, by NASA, public domain](https://visibleearth.nasa.gov/images/74318/april-blue-marble-next-generation-w-topography)
         - [clouds, by NASA, public domain](https://visibleearth.nasa.gov/images/57747/blue-marble-clouds)
+    - Moon: [By Solar System Scope, CC BY 4.0](https://www.solarsystemscope.com/textures/)
+        - Downscaled by 2x with LoHalo interpolation
+        - Applied GIMP's Sharpen (Unsharp Mask) filter with Radius=2, Amount=0.5, Threshold=0
+        - Exported as 70% quality JPEG
     - Mars: [By Solar System Scope, CC BY 4.0](https://www.solarsystemscope.com/textures/)
     - Jupiter: [By Björn Jónsson, CC BY 3.0](https://www.planetary.org/space-images/merged-cassini-and-juno)
         - Downscaled by 2x with LoHalo interpolation

src/cmd.rs

@@ -897,7 +897,8 @@ fn spawn_entities(
         let orbited_mass: Option<f64> = if let Some(id) = &state.orbit_object_id {
             match id.as_str() {
                 "jupiter" => Some(nature::JUPITER_MASS),
-                "sol" => Some(nature::JUPITER_MASS),
+                "earth" => Some(nature::EARTH_MASS),
+                "sol" => Some(nature::SOL_MASS),
                 _ => {
                     error!("Found no mass for object `{id}`");
                     continue;

src/data/defs.txt

@@ -48,6 +48,24 @@ actor 0 0 0
             only_in_map_at_dist 1e10 jupiter
             clickable no
             physics off
+        actor 0 0 0 luna
+            name Luna
+            relativeto earth
+            id themoon
+            orbitaround earth 384399e3
+            tidally locked
+            angularmomentum 0 0 0
+            scale 1737.4e3
+            rotationz 90
+            sphere yes
+            moon yes
+            physics off
+            actor 0 0 0 orbitring
+                relativeto earth
+                scale 384399e3
+                only_in_map_at_dist 1e8 themoon
+                clickable no
+                physics off
     actor 0 0 0 mars
         name Mars
         planet yes

src/hud.rs

@@ -49,7 +49,7 @@ pub const PLAYER_AR_AVATARS: &[(Avatar, &str, f32, &str)] = &[
     (Avatar::Skirt, "suit_ar_skirt", 1.0, "Skirt"),
     (Avatar::Nekomimi, "suit_ar_nekomimi", 1.0, "Cat Ears"),
     (Avatar::Wings, "suit_ar_wings", 1.0, "Wings"),
-    (Avatar::Asteroid, "asteroid2", 1.2, "Asteroid"),
+    (Avatar::Asteroid, "metis", 1.3, "Asteroid"),
 ];
 
 pub struct HudPlugin;

src/world.rs

@@ -183,6 +183,16 @@ pub fn setup(
             transform: Transform::from_translation(Vec3::new(0.0, 0.0, 0.0)),
             ..default()
         });
+        //commands.spawn(MaterialMeshBundle {
+        //    mesh: meshes.add(mesh),
+        //    material: materials.add(StandardMaterial {
+        //        base_color_texture: Some(asset_server.load("models/textures/milkyway.jpg")),
+        //        unlit: true,
+        //        ..default()
+        //    }),
+        //    transform: Transform::from_rotation(Quat::from_rotation_x(-90f32.to_radians())),
+        //    ..default()
+        //});
     }
 }