Syntriax/Engine-Pong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: updated engine to use the new events

Browse Source
This commit is contained in:
Syntriax
2025-05-31 00:34:27 +03:00
parent 0acd119099
commit 52682d42b6
10 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Shared/Network/LiteNetLib/LiteNetLibServer.cs
View File

@@ -60,17 +60,17 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
return this;
}
private void PollEvents(IUniverse sender, UniverseTime engineTime) => Manager.PollEvents();
private void PollEvents(IUniverse sender, IUniverse.UpdateArguments args) => Manager.PollEvents();
protected override void OnEnteringUniverse(IUniverse universe)
{
base.OnEnteringUniverse(universe);
universe.OnPostUpdate += PollEvents;
universe.OnPostUpdate.AddListener(PollEvents);
}
protected override void OnExitingUniverse(IUniverse universe)
{
base.OnExitingUniverse(universe);
universe.OnPostUpdate -= PollEvents;
universe.OnPostUpdate.RemoveListener(PollEvents);
}
}

25
Shared/Network/NetworkManager.cs
View File

@@ -41,10 +41,9 @@ public class NetworkManager : UniverseObject, INetworkManager
{
CacheDelegates();
_networkEntityCollector.OnCollected += OnCollected;
_networkEntityCollector.OnRemoved += OnRemoved;
_networkEntityCollector.OnCollected.AddListener(OnCollected);
_networkEntityCollector.OnRemoved.AddListener(OnRemoved);
}
private void CacheDelegates()
{
// Find network packets implementing INetworkPacket
@@ -121,12 +120,14 @@ public class NetworkManager : UniverseObject, INetworkManager
serverListenerData.ListenerMethod.Invoke(serverListenerData.Object, [entityDataPacket, fromClientId]);
}
private void OnCollected(IBehaviourCollector<INetworkEntity> sender, INetworkEntity behaviourCollected)
private void OnCollected(IBehaviourCollector<INetworkEntity> sender, IBehaviourCollector<INetworkEntity>.BehaviourCollectedArguments args)
{
if (!_networkEntities.TryAdd(behaviourCollected.Id, behaviourCollected))
throw new($"Unable to add {behaviourCollected.Id} to {nameof(NetworkManager)}");
INetworkEntity collectedBehaviour = args.BehaviourCollected;
foreach (Type clientListenerType in behaviourCollected.GetType().GetInterfaces().Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPacketListenerClient<>)))
if (!_networkEntities.TryAdd(collectedBehaviour.Id, collectedBehaviour))
throw new($"Unable to add {collectedBehaviour.Id} to {nameof(NetworkManager)}");
foreach (Type clientListenerType in collectedBehaviour.GetType().GetInterfaces().Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPacketListenerClient<>)))
{
Type clientListenerParameterType = clientListenerType.GetGenericArguments().First();
MethodInfo clientListenerReceiveMethod = clientListenerType.GetMethods().First(m => m.Name == nameof(IPacketListenerClient<INetworkEntity>.OnClientPacketArrived));
@@ -137,10 +138,10 @@ public class NetworkManager : UniverseObject, INetworkManager
clientPacketListeners.Add(clientListenerParameterType, clientListeners);
}
clientListeners.Add(behaviourCollected.Id, new(behaviourCollected, clientListenerReceiveMethod));
clientListeners.Add(collectedBehaviour.Id, new(collectedBehaviour, clientListenerReceiveMethod));
}
foreach (Type serverListenerType in behaviourCollected.GetType().GetInterfaces().Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPacketListenerServer<>)))
foreach (Type serverListenerType in collectedBehaviour.GetType().GetInterfaces().Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPacketListenerServer<>)))
{
Type serverListenerParameterType = serverListenerType.GetGenericArguments().First();
MethodInfo serverListenerReceiveMethod = serverListenerType.GetMethods().First(m => m.Name == nameof(IPacketListenerServer<INetworkEntity>.OnServerPacketArrived));
@@ -151,13 +152,13 @@ public class NetworkManager : UniverseObject, INetworkManager
serverPacketListeners.Add(serverListenerParameterType, serverListeners);
}
serverListeners.Add(behaviourCollected.Id, new(behaviourCollected, serverListenerReceiveMethod));
serverListeners.Add(collectedBehaviour.Id, new(collectedBehaviour, serverListenerReceiveMethod));
}
}
private void OnRemoved(IBehaviourCollector<INetworkEntity> sender, INetworkEntity behaviourRemoved)
private void OnRemoved(IBehaviourCollector<INetworkEntity> sender, IBehaviourCollector<INetworkEntity>.BehaviourRemovedArguments args)
{
_networkEntities.Remove(behaviourRemoved.Id);
_networkEntities.Remove(args.BehaviourRemoved.Id);
}
protected override void OnExitingUniverse(IUniverse universe) => _networkEntityCollector.Unassign();