fix planet/moon sizes

This commit is contained in:
yuni 2024-04-02 01:14:05 +02:00
parent 0e80bdb732
commit 8b7ccc1b58
2 changed files with 16 additions and 6 deletions

View file

@ -258,7 +258,7 @@ pub fn load_defs(
state.is_vehicle = true; state.is_vehicle = true;
} }
["moon", "yes"] => { ["moon", "yes"] => {
state.model_scale *= 6.0; state.model_scale *= 3.0;
} }
["oxygen", amount] => { ["oxygen", amount] => {
if let Ok(amount) = amount.parse::<f32>() { if let Ok(amount) = amount.parse::<f32>() {
@ -286,6 +286,16 @@ pub fn load_defs(
continue; continue;
} }
} }
["radius", radius] => {
// like scale, just doubled size
if let Ok(radius_float) = radius.parse::<f32>() {
state.model_scale = 2.0 * radius_float;
}
else {
error!("Can't parse float: {line}");
continue;
}
}
["rotationx", rotation_x] => { ["rotationx", rotation_x] => {
if let Ok(rotation_x_float) = rotation_x.parse::<f32>() { if let Ok(rotation_x_float) = rotation_x.parse::<f32>() {
state.rotation *= Quat::from_rotation_x(PI * rotation_x_float); state.rotation *= Quat::from_rotation_x(PI * rotation_x_float);

View file

@ -1,6 +1,6 @@
actor 0 0 0 jupiter actor 0 0 0 jupiter
id jupiter id jupiter
scale 71492e3 radius 71492e3
sphere yes sphere yes
physics off physics off
rotationx -0.50 rotationx -0.50
@ -36,7 +36,7 @@ actor 10 -30 20 MeteorAceGT
actor 0 0 0 io actor 0 0 0 io
relativeto jupiter relativeto jupiter
orbit 421700e3 0.75 orbit 421700e3 0.75
scale 1822e3 radius 1822e3
rotationy -0.40 rotationy -0.40
angularmomentum 0 0.0001 0 angularmomentum 0 0.0001 0
sphere yes sphere yes
@ -46,7 +46,7 @@ actor 0 0 0 io
actor 0 0 0 europa actor 0 0 0 europa
relativeto jupiter relativeto jupiter
orbit 670900e3 0.35 orbit 670900e3 0.35
scale 1561e3 radius 1561e3
rotationy 0.20 rotationy 0.20
angularmomentum 0 0.0001 0 angularmomentum 0 0.0001 0
sphere yes sphere yes
@ -56,7 +56,7 @@ actor 0 0 0 europa
actor 0 0 0 ganymede actor 0 0 0 ganymede
relativeto jupiter relativeto jupiter
orbit 1070400e3 0.93 orbit 1070400e3 0.93
scale 2634e3 radius 2634e3
rotationy -0.40 rotationy -0.40
angularmomentum 0 0.0001 0 angularmomentum 0 0.0001 0
sphere yes sphere yes
@ -66,7 +66,7 @@ actor 0 0 0 ganymede
actor 0 0 0 callisto actor 0 0 0 callisto
relativeto jupiter relativeto jupiter
orbit 1882700e3 0.45 orbit 1882700e3 0.45
scale 2410e3 radius 2410e3
rotationy -0.40 rotationy -0.40
angularmomentum 0 0.0001 0 angularmomentum 0 0.0001 0
sphere yes sphere yes