From 5889aed6fa20de5b82c16bdea5cfd3c6375f0142 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Mon, 1 Apr 2024 17:55:58 +0200
Subject: [PATCH] place remaining objects relative to jupiter

---
 src/defs.txt | 32 +++++++++++++++++++-------------
 src/world.rs |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/defs.txt b/src/defs.txt
index d8468be..57faf76 100644
--- a/src/defs.txt
+++ b/src/defs.txt
@@ -1,4 +1,14 @@
-actor 0 0 0 suit
+actor 0 0 0 jupiter
+    id jupiter
+    scale 400000
+    sphere yes
+    physics off
+    rotationx -0.50
+    rotationz -0.28
+    angularmomentum 30 30 30
+
+actor -300000 0 -500000 suit
+    relativeto jupiter
     player yes
     id player
     mass 200.0
@@ -22,15 +32,8 @@ actor 10 -30 20 MeteorAceGT
     mass 3000
     angularmomentum 0.1 0.1 0.3
 
-actor 300000 0 500000 jupiter
-    scale 400000
-    sphere yes
-    physics off
-    rotationx -0.50
-    rotationz -0.28
-    angularmomentum 30 30 30
-
-actor -435000 0 -435000 io
+actor -735000 0 -935000 io
+    relativeto jupiter
     scale 10188
     rotationy -0.40
     angularmomentum 0 0.0001 0
@@ -38,7 +41,8 @@ actor -435000 0 -435000 io
     moon yes
     physics off
 
-actor -900000 200000 1900000 europa
+actor -1200000 200000 1400000 europa
+    relativeto jupiter
     scale 8733
     rotationy 0.20
     angularmomentum 0 0.0001 0
@@ -46,7 +50,8 @@ actor -900000 200000 1900000 europa
     moon yes
     physics off
 
-actor 2500000 0 -1000000 ganymede
+actor 2200000 0 -1500000 ganymede
+    relativeto jupiter
     scale 14737
     rotationy -0.40
     angularmomentum 0 0.0001 0
@@ -54,7 +59,8 @@ actor 2500000 0 -1000000 ganymede
     moon yes
     physics off
 
-actor -4000000 0 1500000 callisto
+actor -4300000 0 1000000 callisto
+    relativeto jupiter
     scale 13484
     rotationy -0.40
     angularmomentum 0 0.0001 0
diff --git a/src/world.rs b/src/world.rs
index e0486e4..1625801 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -172,7 +172,7 @@ pub fn setup(
             }),
             ..default()
         },
-        Position::from_xyz(300000.0, -1000.0, 500000.0),
+        Position::from_xyz(0.0, 0.0, 0.0),
         Rotation::from(Quat::from_rotation_z(1f32.to_radians())),
     ));