Attempt to improve time

2026-01-01 21:49:12 +01:00
parent 69a0a752be
commit 26625f6b6f
12 changed files with 2302 additions and 1913 deletions
--- a/Assets/Scripts/GameManager.asset
+++ b/Assets/Scripts/GameManager.asset
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -88,7 +88,7 @@ namespace Marro.PacManUdon
            StartAttractMode();
        }

-        public void FixedUpdate()
+        public override void FixedUpdate()
        {
            TimeSequenceUpdate(Time.deltaTime);
        }
@@ -422,7 +422,7 @@ namespace Marro.PacManUdon
            ghostManager.SetOwner(Networking.LocalPlayer);
        }

-        public override void AppendSyncedData(byte[][] data, ref int offset, NetworkEventType eventType, uint eventTime)
+        public override void AppendSyncedData(byte[][] data, ref int offset, NetworkEventType eventType)
        {
            data[offset++] = new byte[] { Int32ToByte((int)gameState) };
            data[offset++] = BitConverter.GetBytes(currentlyInTimeSequence);
@@ -430,7 +430,7 @@ namespace Marro.PacManUdon
            data[offset++] = BitConverter.GetBytes(timeSequenceProgress);
        }

-        public override bool SetSyncedData(byte[] data, ref int offset, NetworkEventType eventType, uint eventTime)
+        public override bool SetSyncedData(byte[] data, ref int offset, NetworkEventType eventType)
        {
            SetGameState((PacManGameState)data[offset++]);

@@ -443,11 +443,6 @@ namespace Marro.PacManUdon
            return true;
        }

-        public override void SyncedToNewTime(uint oldTime, uint newTime)
-        {
-            
-        }
-
        public int ExtraLives
        {
            set
--- a/Assets/Scripts/Ghost.asset
+++ b/Assets/Scripts/Ghost.asset
--- a/Assets/Scripts/Ghost.cs
+++ b/Assets/Scripts/Ghost.cs
@@ -150,7 +150,7 @@ namespace Marro.PacManUdon
            // Debug.Log($"{gameObject} reset with state: {state}, target: {target}, offGrid: {offGrid}");
        }

-        void FixedUpdate()
+        public override void FixedUpdate()
        {
            if (ghostType == PacManGhostType.Blinky)
            {
@@ -779,11 +779,6 @@ namespace Marro.PacManUdon
            UpdateAnimator();
        }

-        public override void AppendSyncedData(byte[][] data, ref int offset, NetworkEventType eventType, uint eventTime)
-        {
-            base.AppendSyncedData(data, ref offset, eventType, eventTime);
-        }
-
        void OnTriggerEnter(Collider other)
        {
            if (Networking.IsOwner(gameObject) && other.gameObject.GetComponent<PacManGhostCollider>())
--- a/Assets/Scripts/GridMover.cs
+++ b/Assets/Scripts/GridMover.cs
@@ -32,7 +32,7 @@ namespace Marro.PacManUdon

        protected abstract void UpdateAnimator();

-        public override void AppendSyncedData(byte[][] data, ref int offset, NetworkEventType eventType, uint eventTime)
+        public override void AppendSyncedData(byte[][] data, ref int offset, NetworkEventType eventType)
        {
            var position = GetPosition();
            data[offset++] = BitConverter.GetBytes(position.x);
@@ -43,7 +43,7 @@ namespace Marro.PacManUdon
            data[offset++] = BitConverter.GetBytes(direction.y);
        }

-        public override bool SetSyncedData(byte[] data, ref int offset, NetworkEventType eventType, uint eventTime)
+        public override bool SetSyncedData(byte[] data, ref int offset, NetworkEventType eventType)
        {
            SetPosition(new Vector2(BitConverter.ToSingle(data, offset), BitConverter.ToSingle(data, offset + 2)));
            SetDirection(new Vector2(BitConverter.ToSingle(data, offset + 4), BitConverter.ToSingle(data, offset + 6)));
@@ -51,10 +51,5 @@ namespace Marro.PacManUdon

            return true;
        }
-
-        public override void SyncedToNewTime(uint oldTime, uint newTime)
-        {
-
-        }
    }
 }
--- a/Assets/Scripts/NetworkManager.asset
+++ b/Assets/Scripts/NetworkManager.asset
@@ -43,7 +43,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 12
-      Data: 10
+      Data: 11
    - Name: 
      Entry: 7
      Data: 
@@ -331,25 +331,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: nextEventTime
+      Data: nextEventTimeTicks
    - Name: $v
      Entry: 7
      Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: nextEventTime
+      Data: nextEventTimeTicks
    - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 20|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: System.UInt32, mscorlib
-    - Name: 
-      Entry: 8
-      Data: 
+      Entry: 9
+      Data: 17
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 20
+      Data: 17
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -364,7 +358,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -388,13 +382,13 @@ MonoBehaviour:
      Data: retriesWithoutSuccess
    - Name: $v
      Entry: 7
-      Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: retriesWithoutSuccess
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 23|System.RuntimeType, mscorlib
+      Data: 22|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: System.Int32, mscorlib
@@ -403,7 +397,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 23
+      Data: 22
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -418,7 +412,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -442,13 +436,13 @@ MonoBehaviour:
      Data: buffer
    - Name: $v
      Entry: 7
-      Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: buffer
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 26|System.RuntimeType, mscorlib
+      Data: 25|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: System.Byte[], mscorlib
@@ -457,7 +451,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 26
+      Data: 25
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -472,7 +466,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -496,16 +490,16 @@ MonoBehaviour:
      Data: index
    - Name: $v
      Entry: 7
-      Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: index
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 23
+      Data: 22
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 23
+      Data: 22
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -520,7 +514,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -544,16 +538,16 @@ MonoBehaviour:
      Data: networkedData
    - Name: $v
      Entry: 7
-      Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: networkedData
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 26
+      Data: 25
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 26
+      Data: 25
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -568,13 +562,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 32|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 31|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -590,6 +584,54 @@ MonoBehaviour:
    - Name: 
      Entry: 8
      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: <CurrentTimeTicks>k__BackingField
+    - Name: $v
+      Entry: 7
+      Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: <CurrentTimeTicks>k__BackingField
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 17
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 17
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 6
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: false
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: 
      Entry: 13
      Data: 
--- a/Assets/Scripts/NetworkManager.cs
+++ b/Assets/Scripts/NetworkManager.cs
@@ -1,4 +1,6 @@
-using System;
+using Cysharp.Threading.Tasks.Triggers;
+using JetBrains.Annotations;
+using System;
 using System.Drawing;
 using System.Text;
 using UdonSharp;
@@ -46,8 +48,7 @@ namespace Marro.PacManUdon
        private bool isSynced;

        private long startTimeTicks = DateTime.UtcNow.Ticks; // Initialize to prevent errors
-
-        private uint nextEventTime;
+        private long nextEventTimeTicks;

        private int retriesWithoutSuccess;

@@ -64,6 +65,8 @@ namespace Marro.PacManUdon

        [UdonSynced] private byte[] networkedData = new byte[0];

+        public long CurrentTimeTicks { get; private set; }
+
        public void Initialize()
        {
            if (!BitConverter.IsLittleEndian)
@@ -90,6 +93,8 @@ namespace Marro.PacManUdon
            {
                ProgressReplayTime();
            }
+
+            UpdateTime(DateTime.UtcNow.Ticks);
        }

        public void SendEvent(NetworkEventType eventType)
@@ -100,13 +105,13 @@ namespace Marro.PacManUdon
                return;
            }

-            var eventTime = CurrentTime;
+            var eventTime = GetTimestamp(CurrentTimeTicks);

            InitializeEvent(eventType, eventTime, BufferMaxSizeBytes, out byte[][] data, out var index);

            foreach (var obj in syncedObjects)
            {
-                obj.AppendSyncedData(data, ref index, eventType, eventTime);
+                obj.AppendSyncedData(data, ref index, eventType);
            }

            // Get event size, skipping over the event size which is not yet included
@@ -210,11 +215,11 @@ namespace Marro.PacManUdon
            this.index = size;

            // Sync up to the time in the full sync
-            var time = BitConverter.ToUInt32(networkedData, index + HeaderTimestampIndex);
-            SyncToTime(time);
+            var timestamp = BitConverter.ToUInt32(networkedData, index + HeaderTimestampIndex);
+            SyncToTimestamp(timestamp);

            // Immediately apply the full sync
-            nextEventTime = time;
+            nextEventTimeTicks = GetTimeTicks(timestamp);
            isSynced = true;
        }

@@ -233,8 +238,7 @@ namespace Marro.PacManUdon

        private void ProgressReplayTime()
        {
-            var currentTime = CurrentTime;
-            while (index != 0 && nextEventTime <= currentTime)
+            while (index != 0 && nextEventTimeTicks <= CurrentTimeTicks)
            {
                ProcessIncomingEvent();
                UpdateNextEventTime();
@@ -248,10 +252,10 @@ namespace Marro.PacManUdon
                return;
            }

-            var nextEventTime = BitConverter.ToUInt32(buffer, HeaderTimestampIndex);
-            if (nextEventTime >= this.nextEventTime)
+            var nextEventTimeTicks = GetTimeTicks(BitConverter.ToUInt32(buffer, HeaderTimestampIndex));
+            if (nextEventTimeTicks >= this.nextEventTimeTicks)
            {
-                this.nextEventTime = nextEventTime;
+                this.nextEventTimeTicks = nextEventTimeTicks;
            }
            else
            {
@@ -263,31 +267,31 @@ namespace Marro.PacManUdon

        private void ProcessIncomingEvent()
        {
-            var eventTime = BitConverter.ToUInt32(buffer, HeaderTimestampIndex);
+            var eventTimeTicks = GetTimeTicks(BitConverter.ToUInt32(buffer, HeaderTimestampIndex));
            var eventType = (NetworkEventType)buffer[HeaderEventTypeIndex];
            var index = (int)HeaderLength; // Skip header

-            if (false) // TODO: check event type
+            UpdateTime(eventTimeTicks);
+
+            foreach (var obj in syncedObjects)
            {
-                Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Invalid event type for incoming data! Buffer will be cleared.");
-                HandleError();
-                return;
+                obj.FixedUpdate();
            }

            foreach (var obj in syncedObjects)
            {
-                var success = obj.SetSyncedData(buffer, ref index, eventType, eventTime);
+                var success = obj.SetSyncedData(buffer, ref index, eventType);

                if (!success)
                {
-                    Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Malformed data reported by {obj.name} during event type {eventType}! Resetting state.");
+                    Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Malformed data reported by {obj.name} during event type {eventType}!");
                    HandleError();
                    return;
                }

                if (index > this.index)
                {
-                    Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Buffer overflow during SetSyncedData for {obj.name} in event type {eventType}! Resetting state.");
+                    Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Buffer overflow during {nameof(SyncedObject.SetSyncedData)} for {obj.name} in event type {eventType}!");
                    HandleError();
                    return;
                }
@@ -308,10 +312,11 @@ namespace Marro.PacManUdon
            retriesWithoutSuccess = 0; // We had success!
        }

-        private void SyncToTime(uint newTime)
+        private void SyncToTimestamp(uint newTime)
        {
            var timeToSyncTo = newTime - Delay;
            startTimeTicks = DateTime.UtcNow.Ticks - timeToSyncTo * TimeSpan.TicksPerMillisecond;
+
            Debug.Log($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Synced to time {newTime}, startTimeTicks is now {startTimeTicks}");
        }

@@ -483,12 +488,26 @@ namespace Marro.PacManUdon
            }
        }

-        public float GetDtInSeconds(uint currentTime, uint lastUpdate)
+        private void UpdateTime(long timeTicks)
        {
-            return (CurrentTime - lastUpdate) / 1000f;
+            CurrentTimeTicks = timeTicks;
+
+            foreach (var obj in syncedObjects)
+            {
+                obj.Dt = (timeTicks - obj.LastUpdateTicks) / (float)TimeSpan.TicksPerSecond;
+                obj.LastUpdateTicks = timeTicks;
+            }
        }

-        public uint CurrentTime => (uint)((DateTime.UtcNow.Ticks - startTimeTicks) / TimeSpan.TicksPerMillisecond);
+        public uint GetTimestamp(long timeTicks)
+        {
+            return (uint)((timeTicks - startTimeTicks) / TimeSpan.TicksPerMillisecond);
+        }
+
+        public long GetTimeTicks(uint timeStamp)
+        {
+            return timeStamp * TimeSpan.TicksPerMillisecond + startTimeTicks;
+        }

        public bool IsOwner => isOwner;

--- a/Assets/Scripts/PacMan.asset
+++ b/Assets/Scripts/PacMan.asset
--- a/Assets/Scripts/PacMan.cs
+++ b/Assets/Scripts/PacMan.cs
@@ -75,7 +75,7 @@
            animator.SetTrigger("Reset");
        }

-        void FixedUpdate()
+        public override void FixedUpdate()
        {
            // gameStateManager.statusDisplay.SetDebugText(1, this.targetDirection.ToString());

--- a/Assets/Scripts/SyncedObject.cs
+++ b/Assets/Scripts/SyncedObject.cs
@@ -6,8 +6,10 @@ namespace Marro.PacManUdon
 {
    public abstract class SyncedObject : UdonSharpBehaviour
    {
-        public abstract void AppendSyncedData(byte[][] data, ref int index, NetworkEventType eventType, uint eventTime);
-        public abstract bool SetSyncedData(byte[] data, ref int index, NetworkEventType eventType, uint eventTime);
-        public abstract void SyncedToNewTime(uint oldTime, uint newTime);
+        public long LastUpdateTicks { get; set; }
+        public float Dt { get; set; }
+        public abstract void FixedUpdate();
+        public abstract void AppendSyncedData(byte[][] data, ref int index, NetworkEventType eventType);
+        public abstract bool SetSyncedData(byte[] data, ref int index, NetworkEventType eventType);
    }
 }