From 0f9dc3e24fd39d202acbccdce99160908801b0b9 Mon Sep 17 00:00:00 2001
From: ghostly_zsh <ghostly@e3t.cc>
Date: Wed, 20 May 2026 23:15:10 -0500
Subject: [PATCH] fix: time offset to sync orbit

---
 crates/unified/src/client/components/mod.rs |  2 +-
 crates/unified/src/client/mod.rs            | 14 ++++++++++----
 crates/unified/src/client/zoom.rs           |  6 ++++--
 crates/unified/src/server/player/join.rs    |  6 ++++--
 crates/unified/src/shared/ecs.rs            |  3 +++
 crates/unified/src/shared/net.rs            |  5 +++--
 crates/unified/src/shared/orbit.rs          |  7 +++++--
 crates/unified/src/shared/plugins.rs        |  3 ++-
 8 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/crates/unified/src/client/components/mod.rs b/crates/unified/src/client/components/mod.rs
index 3023c7977e1723e1f8b43ef831f0133acc426835..7d6c4d8bbd814a3a9076b04c6f58506ba82e97b8 100644
--- a/crates/unified/src/client/components/mod.rs
+++ b/crates/unified/src/client/components/mod.rs
@@ -1,4 +1,4 @@
-use crate::prelude::Component;
+use crate::prelude::{Component, Resource};
 
 #[derive(Component)]
 pub struct MainCamera;
diff --git a/crates/unified/src/client/mod.rs b/crates/unified/src/client/mod.rs
index f23446ba634d16ff947c264b14a4f2a7b278e7a5..7ca9848114f16bfc01ad088321aa072992f97818 100644
--- a/crates/unified/src/client/mod.rs
+++ b/crates/unified/src/client/mod.rs
@@ -19,7 +19,7 @@ use crate::prelude::*;
 use planet::incoming_planets::incoming_planets_plugin;
 use crate::client::components::Me;
 use crate::client::ship::attachment::client_attachment_plugin;
-use crate::shared::ecs::GameplayState;
+use crate::shared::ecs::{GameplayState, TimeOffset};
 use crate::shared::gravity::update_gravity;
 use crate::shared::net::Hi;
 use crate::shared::orbit::OrbitPlugin;
@@ -65,7 +65,8 @@ impl Plugin for ClientPlugin {
             .add_plugins(crafting_ui_plugin)
             .add_systems(Update, find_me)
             .insert_state(GameplayState::Main)
-            .insert_resource(DebugPickingMode::Disabled);
+            .insert_resource(DebugPickingMode::Disabled)
+            .insert_resource(TimeOffset::default());
 
         let server = self.server.clone();
         app.add_systems(PostStartup, move |mut commands: Commands| {
@@ -117,10 +118,15 @@ pub fn on_disconnected(trigger: On<Disconnected>, names: Query<&Name>) {
     }
 }
 
-pub fn find_me(mut msgs: MessageReader<Hi>, mut commands: Commands) {
+pub fn find_me(
+    mut msgs: MessageReader<Hi>,
+    mut commands: Commands,
+    mut time_offset: ResMut<TimeOffset>,
+) {
     for msg in msgs.read() {
         let we_are = msg.you_are;
         info!(?we_are, "joined successfully");
         commands.entity(we_are).insert(Me);
+        time_offset.0 = msg.time_offset;
     }
-}
\ No newline at end of file
+}
diff --git a/crates/unified/src/client/zoom.rs b/crates/unified/src/client/zoom.rs
index 23ea6cde3d7e8c0de34275fe6d49d2c07fcabc98..2e4dcc7f276cc6fbda7ccbab904f49a9a6a853a3 100644
--- a/crates/unified/src/client/zoom.rs
+++ b/crates/unified/src/client/zoom.rs
@@ -7,6 +7,8 @@ use crate::client::starfield::{parallax_layer_translation, StarfieldSize, BACK_S
 use crate::client::starguide::components::{StarfieldBack, StarfieldFront, StarfieldMid, StarguideCamera};
 use crate::shared::ecs::GameplayState;
 
+const STARGUIDE_ZOOM_LEVEL: f32 = 20.0;
+
 fn restore_tiled(sprite: &mut Sprite, size: Option<&StarfieldSize>) {
     if let Some(size) = size {
         sprite.image_mode = SpriteImageMode::Tiled {
@@ -100,7 +102,7 @@ fn on_scroll(
                     camera_projection.scale *= 1.03;
                     starguide_projection.scale *= 1.03;
                 }
-                if camera_projection.scale > 20.0 && matches!(gameplay_state.get(), GameplayState::Main) {
+                if camera_projection.scale > STARGUIDE_ZOOM_LEVEL && matches!(gameplay_state.get(), GameplayState::Main) {
                     camera.0.is_active = false;
                     starguide_camera.0.is_active = true;
                     starguide_camera.2.translation = player.translation;
@@ -112,7 +114,7 @@ fn on_scroll(
                     *visibility_back = Visibility::Hidden;
                     *visibility_mid = Visibility::Hidden;
                     *visibility_front = Visibility::Hidden;
-                } else if camera_projection.scale <= 20.0 && matches!(gameplay_state.get(), GameplayState::Starguide) {
+                } else if camera_projection.scale <= STARGUIDE_ZOOM_LEVEL && matches!(gameplay_state.get(), GameplayState::Starguide) {
                     camera.0.is_active = true;
                     gameplay_next_state.set(GameplayState::Main);
                     starguide_camera.0.is_active = false;
diff --git a/crates/unified/src/server/player/join.rs b/crates/unified/src/server/player/join.rs
index b4d4e0ef86c19cbb1005c5ff108f8aa7798492e5..8f8ea64bd4630c5ed79ab1f9fd7bb36f7e8cc58b 100644
--- a/crates/unified/src/server/player/join.rs
+++ b/crates/unified/src/server/player/join.rs
@@ -69,7 +69,8 @@ pub fn handle_new_players(
     world_config: Res<WorldConfigResource>,
     planets: Query<(&Transform, &LinearVelocity, &Planet)>,
     asset_server: Res<AssetServer>,
-    mut welcome_messages: MessageWriter<ToClients<Hi>>
+    mut welcome_messages: MessageWriter<ToClients<Hi>>,
+    time: Res<Time>,
 ) {
     if q_new_clients.is_empty() { return }
     let Some(wc) = &world_config.config else {
@@ -84,7 +85,8 @@ pub fn handle_new_players(
         welcome_messages.write(ToClients {
             mode: SendMode::Direct(ClientId::Client(joined_player.1.network_entity)),
             message: Hi {
-                you_are: joined_player.0
+                you_are: joined_player.0,
+                time_offset: time.elapsed_secs_f64(),
             },
         });
         join_player(joined_player.0, commands.reborrow(), wc, planets, &asset_server);
diff --git a/crates/unified/src/shared/ecs.rs b/crates/unified/src/shared/ecs.rs
index 8c705ad6385fed46e2fedd04f2ecac50d3c6bc71..0d4b4f5dc5c53471b6e02b659034408b71d52670 100644
--- a/crates/unified/src/shared/ecs.rs
+++ b/crates/unified/src/shared/ecs.rs
@@ -36,6 +36,9 @@ pub struct Part {
 #[derive(Component, Debug)]
 pub struct PartHandle(pub Handle<PartConfig>);
 
+#[derive(Resource, Default)]
+pub struct TimeOffset(pub f64);
+
 #[derive(Component, Serialize, Deserialize, Debug)]
 pub struct Player {
     pub client: Entity,
diff --git a/crates/unified/src/shared/net.rs b/crates/unified/src/shared/net.rs
index 9f904db703461ae8d1cc14b5e34c4a6015c53a28..e97791b87c03f3d5d6b23fcd091b8cc695c90f6c 100644
--- a/crates/unified/src/shared/net.rs
+++ b/crates/unified/src/shared/net.rs
@@ -50,5 +50,6 @@ pub fn register_replication(app: &mut App) {
 #[derive(Message, Deserialize, Serialize, MapEntities)]
 pub struct Hi {
     #[entities]
-    pub you_are: Entity
-}
\ No newline at end of file
+    pub you_are: Entity,
+    pub time_offset: f64,
+}
diff --git a/crates/unified/src/shared/orbit.rs b/crates/unified/src/shared/orbit.rs
index 4a00eb88f5a01594a71a106b6fd65bcfff95a398..3360ddee63731d73cc2d69e260de3db22fa99674 100644
--- a/crates/unified/src/shared/orbit.rs
+++ b/crates/unified/src/shared/orbit.rs
@@ -2,10 +2,12 @@ use std::collections::HashMap;
 use std::f64::consts::PI;
 use avian2d::math::TAU;
 use avian2d::prelude::{LinearVelocity, Mass};
+use bevy::log::debug;
 use bevy::prelude::{App, Plugin, Transform, Update};
 use bevy::time::Time;
 use crate::shared::config::planet::{Planet, PlanetSpring};
 use crate::prelude::{Query, Res, Without};
+use crate::shared::ecs::TimeOffset;
 use crate::shared::world_config::WorldConfigResource;
 
 pub struct OrbitPlugin;
@@ -20,7 +22,8 @@ pub fn update_orbits(
     planets_2: Query<(&Planet, &Transform, &Mass), Without<PlanetSpring>>,
     mut planet_springs: Query<(&PlanetSpring, &mut Transform, &mut LinearVelocity), Without<Planet>>,
     world_config: Res<WorldConfigResource>,
-    time: Res<Time>
+    time: Res<Time>,
+    time_offset: Res<TimeOffset>,
 ) {
     let Some(ref world_config) = world_config.config else {
         return;
@@ -35,7 +38,7 @@ pub fn update_orbits(
         let e = orbit_data.eccentricity;
         let t = 2.0*PI*((a*a*a)/(world_config.world.gravity*(**parent_mass as f64))).sqrt();
 
-        let time = time.elapsed_secs_f64();
+        let time = time.elapsed_secs_f64() + time_offset.0;
 
         let m = (TAU / t) * time;
         let e_k = iterative_kepler(m, e);
diff --git a/crates/unified/src/shared/plugins.rs b/crates/unified/src/shared/plugins.rs
index d49883a36f42ef1ddaa608807b8b1f59f317737e..b86fdd381942e58d6c280e25efa9fa74c99a55a1 100644
--- a/crates/unified/src/shared/plugins.rs
+++ b/crates/unified/src/shared/plugins.rs
@@ -1,5 +1,5 @@
 use aeronet_transport::AeronetTransportPlugin;
-use crate::shared::ecs::{CraftPartRequest, DragRequestEvent, ToggleDrillEvent};
+use crate::shared::ecs::{CraftPartRequest, DragRequestEvent, TimeOffset, ToggleDrillEvent};
 use crate::shared::thrust::ThrustSolution;
 use bevy::app::{App, PluginGroup, PluginGroupBuilder};
 use bevy::diagnostic::DiagnosticsPlugin;
@@ -30,6 +30,7 @@ impl PluginGroup for SharedPluginGroup {
             .add(AeronetTransportPlugin)
             .add(|app: &mut App| {
                 app.insert_resource(Time::from_hz(TICK_RATE));
+                app.insert_resource(TimeOffset::default());
             })
             .add_group(
                 PhysicsPlugins::default()