From 6e23340819969670c3897611192b04cd7c479168 Mon Sep 17 00:00:00 2001
From: c0repwn3r <core@coredoes.dev>
Date: Mon, 17 Apr 2023 09:03:49 -0400
Subject: [PATCH] orbits

---
 server/src/orbit/constants.rs | 2 +-
 server/src/planet.rs          | 2 +-
 server/src/timer.rs           | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/server/src/orbit/constants.rs b/server/src/orbit/constants.rs
index 9acda4221f47103463d1e2ce9b686f53fbde72d5..5924fac108b89a87847641591969902196ca1cf8 100644
--- a/server/src/orbit/constants.rs
+++ b/server/src/orbit/constants.rs
@@ -24,4 +24,4 @@ pub const MOON_MASS: f64 = MOON_MASS_RL * GAME_SCALE_MASS * MOON_MASS_BIAS;
 pub const MOON_PERIAPSIS: f64 = 363228900.0 * GAME_SCALE_DISTANCE * MOON_PERIAPSIS_BIAS;
 pub const MOON_APOAPSIS: f64 = 405400000.0  * GAME_SCALE_DISTANCE * MOON_APOAPSIS_BIAS;
 pub const MOON_ORBIT_TIME_RL: f64 = 2332800.0;
-pub const MOON_ORBIT_TIME: f64 = 1.0; //MOON_ORBIT_TIME_RL * GAME_SCALE_TIME * MOON_ORBIT_TIME_BIAS;
\ No newline at end of file
+pub const MOON_ORBIT_TIME: f64 = MOON_ORBIT_TIME_RL * GAME_SCALE_TIME * MOON_ORBIT_TIME_BIAS;
\ No newline at end of file
diff --git a/server/src/planet.rs b/server/src/planet.rs
index 3aaaebb4ac82be815b5264f1e429cf60b2bf1b71..f995f5b9979784833bd4932da8bba29c67be9504 100644
--- a/server/src/planet.rs
+++ b/server/src/planet.rs
@@ -46,7 +46,7 @@ impl Planets {
     pub fn make_planet(planets: &mut HashMap<String, Planet>, planet_id: &str, planet_type: PlanetType, mass: f64, radius: f64, position: (f64, f64), rigid_body_set: &mut RigidBodySet, collider_set: &mut ColliderSet) {
         let collider = ColliderBuilder::ball(radius / SCALE)
             .build();
-        let body = RigidBodyBuilder::dynamic()
+        let body = RigidBodyBuilder::kinematic_position_based()
             .translation(vector![position.0 / SCALE, position.1 / SCALE])
             .dominance_group(127)
             .additional_mass(0.0);
diff --git a/server/src/timer.rs b/server/src/timer.rs
index c4bd29bce57b4d8034bf22132753c3ce3cf9f17c..83d99fca0e14347a558854ffa5f242c6a6fcc1ec 100644
--- a/server/src/timer.rs
+++ b/server/src/timer.rs
@@ -36,10 +36,7 @@ pub async fn timer_main(mgr: ClientManager, physics_data: Arc<RwLock<PhysicsData
             // update moon
             let new_moon_position = calculate_world_position_of_orbit(calculate_point_on_orbit(MOON_PERIAPSIS, MOON_APOAPSIS, time / MOON_ORBIT_TIME), new_earth_position);
             let moon_body = physics_data.rigid_body_set.get_mut(planets.get_planet_mut("moon").unwrap().body_handle).unwrap();
-            let moon_force = calculate_vector_of_orbit(MOON_PERIAPSIS, MOON_APOAPSIS, time / MOON_ORBIT_TIME, moon_body.translation().x, moon_body.translation().y, new_earth_position[0], new_earth_position[1],MOON_MASS, 1f64 / 20f64);
-            moon_body.reset_forces(true);
-            moon_body.add_force(moon_force, true);
-            //moon_body.set_linvel(moon_force, true);
+            moon_body.set_next_kinematic_position(new_moon_position.into());
             planets.get_planet_mut("moon").unwrap().position = (moon_body.translation()[0] / SCALE, moon_body.translation()[1] / SCALE);
         }