Trying to get stuff to work

This commit is contained in:
2025-12-29 21:02:05 +01:00
parent 8d5362eff6
commit 97fe8cd69f
12 changed files with 1606 additions and 1190 deletions

View File

@@ -1,6 +1,7 @@
using Assets.Scripts;
using JetBrains.Annotations;
using System;
using System.Linq;
using System.Text;
using UdonSharp;
using UnityEngine;
@@ -84,8 +85,23 @@ namespace Marro.PacManUdon
obj.AppendSyncedData(data, ref index);
}
var eventSize = 0;
for (int i = 0; i < index; i++)
{
eventSize += data[i].Length;
}
if (!EnsureSpaceToStorePreparedEvent(eventSize))
{
return;
}
var oldIndex = this.index;
FlattenAndCopy(data, index, buffer, ref this.index);
Debug.Log($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Prepared event with {eventSize} bytes for serialization, index went from {oldIndex} to {this.index}");
RequestSerialization();
}
@@ -105,7 +121,7 @@ namespace Marro.PacManUdon
var syncType = (NetworkEventType)networkedData[4];
var size = networkedData.Length;
if (!EnsureSpaceToStoreEvent(size, syncType == NetworkEventType.FullSync))
if (!EnsureSpaceToStoreReceivedEvent(size, syncType == NetworkEventType.FullSync))
{
return;
}
@@ -137,7 +153,7 @@ namespace Marro.PacManUdon
}
else
{
Debug.LogError($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Events are in invalid order! Clearing buffer.");
Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Events are in invalid order! Clearing buffer.");
ClearBuffer();
return;
}
@@ -151,7 +167,7 @@ namespace Marro.PacManUdon
switch (eventType)
{
default:
Debug.LogError($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Invalid sync type for incoming data! Buffer will be cleared.");
Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Invalid sync type for incoming data! Buffer will be cleared.");
ClearBuffer();
return;
case NetworkEventType.FullSync:
@@ -162,14 +178,14 @@ namespace Marro.PacManUdon
private void ProcessFullSync()
{
var index = 0;
var index = 5; // Skip header
foreach (var obj in syncedObjects)
{
var success = obj.SetSyncedData(buffer, ref index);
if (!success)
{
Debug.LogError($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Malformed data reported by {obj.name} during full sync! Clearing buffer and requesting new full sync.");
Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Malformed data reported by {obj.name} during full sync! Clearing buffer and requesting new full sync.");
ClearBuffer();
RequestFullSync();
return;
@@ -181,7 +197,26 @@ namespace Marro.PacManUdon
Debug.Log($"Processed full sync! Total {index} bytes.");
}
private bool EnsureSpaceToStoreEvent(int eventSize, bool isFullSync)
private bool EnsureSpaceToStorePreparedEvent(int eventSize)
{
if (index + eventSize <= buffer.Length)
{
return true; // Enough space!
}
if (index == 0)
{
Debug.LogError($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Buffer is not large enough to store event! Viewing remote play is not possible.");
return false; // Unable to store event, networking features will not function.
}
ClearBuffer();
Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Too much data in buffer to store event! Old events will be discarded.");
return true; // We can store event now that we cleared the buffer.
}
private bool EnsureSpaceToStoreReceivedEvent(int eventSize, bool isFullSync)
{
if (index + eventSize <= buffer.Length)
{
@@ -198,14 +233,14 @@ namespace Marro.PacManUdon
if (!isFullSync)
{
Debug.LogError($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Too much data in buffer to store event! Old events will be discarded, and full sync will be performed.");
Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Too much data in buffer to store event! Old events will be discarded, and full sync will be performed.");
RequestFullSync();
return false; // No use storing this event, we're going to wait for the full sync.
}
Debug.LogError($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Too much data in buffer to store full sync! Old events will be discarded.");
Debug.LogWarning($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Too much data in buffer to store full sync! Old events will be discarded.");
return true; // We can store event now that we cleared the buffer.
}
@@ -215,8 +250,7 @@ namespace Marro.PacManUdon
index = 2;
data[0] = BitConverter.GetBytes(CurrentTime);
byte eventTypeByte = byte.Parse(eventType.ToString());
data[1] = new byte[] { eventTypeByte };
data[1] = new byte[] { GameManager.Int32ToByte((int)eventType) };
}
private void FlattenAndCopy(byte[][] data, int length, byte[] target, ref int index)