From 19cf53f2263c1d5591e5a9fc415e47cc736df196 Mon Sep 17 00:00:00 2001 From: mischa Date: Wed, 16 Oct 2024 13:01:26 +0200 Subject: [PATCH] include baseline tick# --- .../NetworkTransform/NetworkTransformHybrid2022.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid2022.cs b/Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid2022.cs index 5e6fb7ecc..41ba492b2 100644 --- a/Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid2022.cs +++ b/Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid2022.cs @@ -65,6 +65,10 @@ public class NetworkTransformHybrid2022 : NetworkBehaviour double lastServerBaselineTime; double lastClientUnreliableTime; + // the last baseline we received for this object. + // deltas are based on the baseline, need to make sure we don't apply on an old one. + byte lastServerBaselineSent = 0; + // only sync when changed hack ///////////////////////////////////////// #if onlySyncOnChange_BANDWIDTH_SAVING [Header("Sync Only If Changed")] @@ -253,7 +257,9 @@ protected virtual void OnClientToServerSync(Vector3? position, Quaternion? rotat [ClientRpc(channel = Channels.Reliable)] void RpcServerToClientBaselineSync(byte baselineTick, Vector3? position, Quaternion? rotation, Vector3? scale) { - Debug.LogWarning("TODO process server->client baseline"); + // IMPORTANT: baselineTick is a remote "frameCount & 0xff". + // this can be != compared but not <> compared! + Debug.LogWarning($"TODO process server->client baseline #{baselineTick}"); } // only unreliable. see comment above of this file. @@ -327,13 +333,19 @@ void UpdateServerBaseline() // receiver gets it from batch timestamp to save bandwidth. TransformSnapshot snapshot = ConstructSnapshot(); + RpcServerToClientBaselineSync( + (byte)Time.frameCount, // only sync what the user wants to sync syncPosition ? snapshot.position : default(Vector3?), syncRotation ? snapshot.rotation : default(Quaternion?), syncScale ? snapshot.scale : default(Vector3?) ); + // save the last baseline's tick number. + // included in baseline to identify which one it was on client + // included in deltas to ensure they are on top of the correct baseline + lastServerBaselineSent = (byte)Time.frameCount; lastServerBaselineTime = NetworkTime.localTime; } }