Compare commits

..

No commits in common. "614105558b92a5ea4dde064abc6d2741a0fe1adc" and "9a099c0fe872b9623939fa2b21f57eb6a3b5f434" have entirely different histories.

9 changed files with 2 additions and 36 deletions

View file

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

View file

@ -10,10 +10,6 @@
- Earth: By Yuni, CC0 License. A simple addition of - 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) - [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) - [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/) - 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) - 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 - Downscaled by 2x with LoHalo interpolation

BIN
assets/models/asteroid.glb Normal file

Binary file not shown.

BIN
assets/models/asteroid2.glb Normal file

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 MiB

View file

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

View file

@ -48,24 +48,6 @@ actor 0 0 0
only_in_map_at_dist 1e10 jupiter only_in_map_at_dist 1e10 jupiter
clickable no clickable no
physics off 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 actor 0 0 0 mars
name Mars name Mars
planet yes planet yes

View file

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

View file

@ -183,16 +183,6 @@ pub fn setup(
transform: Transform::from_translation(Vec3::new(0.0, 0.0, 0.0)), transform: Transform::from_translation(Vec3::new(0.0, 0.0, 0.0)),
..default() ..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()
//});
} }
} }