com.unity.netcode.gameobjects@1.0.0-pre.6
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com). ## [1.0.0-pre.6] - 2022-03-02 ### Added - NetworkAnimator now properly synchrhonizes all animation layers as well as runtime-adjusted weighting between them (#1765) - Added first set of tests for NetworkAnimator - parameter syncing, trigger set / reset, override network animator (#1735) ### Changed ### Fixed - Fixed an issue where sometimes the first client to connect to the server could see messages from the server as coming from itself. (#1683) - Fixed an issue where clients seemed to be able to send messages to ClientId 1, but these messages would actually still go to the server (id 0) instead of that client. (#1683) - Improved clarity of error messaging when a client attempts to send a message to a destination other than the server, which isn't allowed. (#1683) - Disallowed async keyword in RPCs (#1681) - Fixed an issue where Alpha release versions of Unity (version 2022.2.0a5 and later) will not compile due to the UNet Transport no longer existing (#1678) - Fixed messages larger than 64k being written with incorrectly truncated message size in header (#1686) (credit: @kaen) - Fixed overloading RPC methods causing collisions and failing on IL2CPP targets. (#1694) - Fixed spawn flow to propagate `IsSceneObject` down to children NetworkObjects, decouple implicit relationship between object spawning & `IsSceneObject` flag (#1685) - Fixed error when serializing ConnectionApprovalMessage with scene management disabled when one or more objects is hidden via the CheckObjectVisibility delegate (#1720) - Fixed CheckObjectVisibility delegate not being properly invoked for connecting clients when Scene Management is enabled. (#1680) - Fixed NetworkList to properly call INetworkSerializable's NetworkSerialize() method (#1682) - Fixed NetworkVariables containing more than 1300 bytes of data (such as large NetworkLists) no longer cause an OverflowException (the limit on data size is now whatever limit the chosen transport imposes on fragmented NetworkDelivery mechanisms) (#1725) - Fixed ServerRpcParams and ClientRpcParams must be the last parameter of an RPC in order to function properly. Added a compile-time check to ensure this is the case and trigger an error if they're placed elsewhere (#1721) - Fixed FastBufferReader being created with a length of 1 if provided an input of length 0 (#1724) - Fixed The NetworkConfig's checksum hash includes the NetworkTick so that clients with a different tickrate than the server are identified and not allowed to connect (#1728) - Fixed OwnedObjects not being properly modified when using ChangeOwnership (#1731) - Improved performance in NetworkAnimator (#1735) - Removed the "always sync" network animator (aka "autosend") parameters (#1746)
This commit is contained in:
@@ -15,6 +15,7 @@ namespace Unity.Netcode.EditorTests
|
||||
public int B;
|
||||
public int C;
|
||||
public static bool Deserialized;
|
||||
public static bool Handled;
|
||||
public static List<TestMessage> DeserializedValues = new List<TestMessage>();
|
||||
|
||||
public void Serialize(FastBufferWriter writer)
|
||||
@@ -22,11 +23,17 @@ namespace Unity.Netcode.EditorTests
|
||||
writer.WriteValueSafe(this);
|
||||
}
|
||||
|
||||
public static void Receive(FastBufferReader reader, in NetworkContext context)
|
||||
public bool Deserialize(FastBufferReader reader, ref NetworkContext context)
|
||||
{
|
||||
Deserialized = true;
|
||||
reader.ReadValueSafe(out TestMessage value);
|
||||
DeserializedValues.Add(value);
|
||||
reader.ReadValueSafe(out this);
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Handle(ref NetworkContext context)
|
||||
{
|
||||
Handled = true;
|
||||
DeserializedValues.Add(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +46,7 @@ namespace Unity.Netcode.EditorTests
|
||||
new MessagingSystem.MessageWithHandler
|
||||
{
|
||||
MessageType = typeof(TestMessage),
|
||||
Handler = TestMessage.Receive
|
||||
Handler = MessagingSystem.ReceiveMessage<TestMessage>
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -51,6 +58,7 @@ namespace Unity.Netcode.EditorTests
|
||||
public void SetUp()
|
||||
{
|
||||
TestMessage.Deserialized = false;
|
||||
TestMessage.Handled = false;
|
||||
TestMessage.DeserializedValues.Clear();
|
||||
|
||||
m_MessagingSystem = new MessagingSystem(new NopMessageSender(), this, new TestMessageProvider());
|
||||
@@ -94,6 +102,7 @@ namespace Unity.Netcode.EditorTests
|
||||
{
|
||||
m_MessagingSystem.HandleMessage(messageHeader, reader, 0, 0, 0);
|
||||
Assert.IsTrue(TestMessage.Deserialized);
|
||||
Assert.IsTrue(TestMessage.Handled);
|
||||
Assert.AreEqual(1, TestMessage.DeserializedValues.Count);
|
||||
Assert.AreEqual(message, TestMessage.DeserializedValues[0]);
|
||||
}
|
||||
@@ -129,7 +138,8 @@ namespace Unity.Netcode.EditorTests
|
||||
{
|
||||
m_MessagingSystem.HandleIncomingData(0, new ArraySegment<byte>(writer.ToArray()), 0);
|
||||
Assert.IsFalse(TestMessage.Deserialized);
|
||||
Assert.IsEmpty(TestMessage.DeserializedValues); ;
|
||||
Assert.IsFalse(TestMessage.Handled);
|
||||
Assert.IsEmpty(TestMessage.DeserializedValues);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -162,6 +172,7 @@ namespace Unity.Netcode.EditorTests
|
||||
m_MessagingSystem.HandleIncomingData(0, new ArraySegment<byte>(writer.ToArray()), 0);
|
||||
m_MessagingSystem.ProcessIncomingMessageQueue();
|
||||
Assert.IsTrue(TestMessage.Deserialized);
|
||||
Assert.IsTrue(TestMessage.Handled);
|
||||
Assert.AreEqual(1, TestMessage.DeserializedValues.Count);
|
||||
Assert.AreEqual(message, TestMessage.DeserializedValues[0]);
|
||||
}
|
||||
@@ -199,10 +210,12 @@ namespace Unity.Netcode.EditorTests
|
||||
{
|
||||
m_MessagingSystem.HandleIncomingData(0, new ArraySegment<byte>(writer.ToArray()), 0);
|
||||
Assert.IsFalse(TestMessage.Deserialized);
|
||||
Assert.IsFalse(TestMessage.Handled);
|
||||
Assert.IsEmpty(TestMessage.DeserializedValues);
|
||||
|
||||
m_MessagingSystem.ProcessIncomingMessageQueue();
|
||||
Assert.IsTrue(TestMessage.Deserialized);
|
||||
Assert.IsTrue(TestMessage.Handled);
|
||||
Assert.AreEqual(2, TestMessage.DeserializedValues.Count);
|
||||
Assert.AreEqual(message, TestMessage.DeserializedValues[0]);
|
||||
Assert.AreEqual(message2, TestMessage.DeserializedValues[1]);
|
||||
|
||||
@@ -5,21 +5,23 @@ namespace Unity.Netcode.EditorTests
|
||||
{
|
||||
public class MessageRegistrationTests
|
||||
{
|
||||
|
||||
private struct TestMessageOne : INetworkMessage
|
||||
{
|
||||
public int A;
|
||||
public int B;
|
||||
public int C;
|
||||
|
||||
public void Serialize(FastBufferWriter writer)
|
||||
{
|
||||
writer.WriteValue(this);
|
||||
}
|
||||
|
||||
public static void Receive(FastBufferReader reader, in NetworkContext context)
|
||||
public bool Deserialize(FastBufferReader reader, ref NetworkContext context)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Handle(ref NetworkContext context)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,15 +30,18 @@ namespace Unity.Netcode.EditorTests
|
||||
public int A;
|
||||
public int B;
|
||||
public int C;
|
||||
|
||||
public void Serialize(FastBufferWriter writer)
|
||||
{
|
||||
writer.WriteValue(this);
|
||||
}
|
||||
|
||||
public static void Receive(FastBufferReader reader, in NetworkContext context)
|
||||
public bool Deserialize(FastBufferReader reader, ref NetworkContext context)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Handle(ref NetworkContext context)
|
||||
{
|
||||
}
|
||||
}
|
||||
private class TestMessageProviderOne : IMessageProvider
|
||||
@@ -48,12 +53,12 @@ namespace Unity.Netcode.EditorTests
|
||||
new MessagingSystem.MessageWithHandler
|
||||
{
|
||||
MessageType = typeof(TestMessageOne),
|
||||
Handler = TestMessageOne.Receive
|
||||
Handler = MessagingSystem.ReceiveMessage<TestMessageOne>
|
||||
},
|
||||
new MessagingSystem.MessageWithHandler
|
||||
{
|
||||
MessageType = typeof(TestMessageTwo),
|
||||
Handler = TestMessageTwo.Receive
|
||||
Handler = MessagingSystem.ReceiveMessage<TestMessageTwo>
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -64,15 +69,18 @@ namespace Unity.Netcode.EditorTests
|
||||
public int A;
|
||||
public int B;
|
||||
public int C;
|
||||
|
||||
public void Serialize(FastBufferWriter writer)
|
||||
{
|
||||
writer.WriteValue(this);
|
||||
}
|
||||
|
||||
public static void Receive(FastBufferReader reader, in NetworkContext context)
|
||||
public bool Deserialize(FastBufferReader reader, ref NetworkContext context)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Handle(ref NetworkContext context)
|
||||
{
|
||||
}
|
||||
}
|
||||
private class TestMessageProviderTwo : IMessageProvider
|
||||
@@ -84,26 +92,28 @@ namespace Unity.Netcode.EditorTests
|
||||
new MessagingSystem.MessageWithHandler
|
||||
{
|
||||
MessageType = typeof(TestMessageThree),
|
||||
Handler = TestMessageThree.Receive
|
||||
Handler = MessagingSystem.ReceiveMessage<TestMessageThree>
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
private struct TestMessageFour : INetworkMessage
|
||||
{
|
||||
public int A;
|
||||
public int B;
|
||||
public int C;
|
||||
|
||||
public void Serialize(FastBufferWriter writer)
|
||||
{
|
||||
writer.WriteValue(this);
|
||||
}
|
||||
|
||||
public static void Receive(FastBufferReader reader, in NetworkContext context)
|
||||
public bool Deserialize(FastBufferReader reader, ref NetworkContext context)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Handle(ref NetworkContext context)
|
||||
{
|
||||
}
|
||||
}
|
||||
private class TestMessageProviderThree : IMessageProvider
|
||||
@@ -115,7 +125,7 @@ namespace Unity.Netcode.EditorTests
|
||||
new MessagingSystem.MessageWithHandler
|
||||
{
|
||||
MessageType = typeof(TestMessageFour),
|
||||
Handler = TestMessageFour.Receive
|
||||
Handler = MessagingSystem.ReceiveMessage<TestMessageFour>
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -158,21 +168,17 @@ namespace Unity.Netcode.EditorTests
|
||||
using (systemTwo)
|
||||
using (systemThree)
|
||||
{
|
||||
MessagingSystem.MessageHandler handlerOne = TestMessageOne.Receive;
|
||||
MessagingSystem.MessageHandler handlerTwo = TestMessageTwo.Receive;
|
||||
MessagingSystem.MessageHandler handlerThree = TestMessageThree.Receive;
|
||||
MessagingSystem.MessageHandler handlerFour = TestMessageFour.Receive;
|
||||
MessagingSystem.MessageHandler handlerOne = MessagingSystem.ReceiveMessage<TestMessageOne>;
|
||||
MessagingSystem.MessageHandler handlerTwo = MessagingSystem.ReceiveMessage<TestMessageTwo>;
|
||||
MessagingSystem.MessageHandler handlerThree = MessagingSystem.ReceiveMessage<TestMessageThree>;
|
||||
MessagingSystem.MessageHandler handlerFour = MessagingSystem.ReceiveMessage<TestMessageFour>;
|
||||
|
||||
var foundHandlerOne = systemOne.MessageHandlers[systemOne.GetMessageType(typeof(TestMessageOne))];
|
||||
|
||||
Assert.AreEqual(handlerOne,
|
||||
systemOne.MessageHandlers[systemOne.GetMessageType(typeof(TestMessageOne))]);
|
||||
Assert.AreEqual(handlerTwo,
|
||||
systemOne.MessageHandlers[systemOne.GetMessageType(typeof(TestMessageTwo))]);
|
||||
Assert.AreEqual(handlerThree,
|
||||
systemTwo.MessageHandlers[systemTwo.GetMessageType(typeof(TestMessageThree))]);
|
||||
Assert.AreEqual(handlerFour,
|
||||
systemThree.MessageHandlers[systemThree.GetMessageType(typeof(TestMessageFour))]);
|
||||
Assert.AreEqual(handlerOne, systemOne.MessageHandlers[systemOne.GetMessageType(typeof(TestMessageOne))]);
|
||||
Assert.AreEqual(handlerTwo, systemOne.MessageHandlers[systemOne.GetMessageType(typeof(TestMessageTwo))]);
|
||||
Assert.AreEqual(handlerThree, systemTwo.MessageHandlers[systemTwo.GetMessageType(typeof(TestMessageThree))]);
|
||||
Assert.AreEqual(handlerFour, systemThree.MessageHandlers[systemThree.GetMessageType(typeof(TestMessageFour))]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,14 +14,18 @@ namespace Unity.Netcode.EditorTests
|
||||
public int B;
|
||||
public int C;
|
||||
public static bool Serialized;
|
||||
|
||||
public void Serialize(FastBufferWriter writer)
|
||||
{
|
||||
Serialized = true;
|
||||
writer.WriteValueSafe(this);
|
||||
}
|
||||
|
||||
public static void Receive(FastBufferReader reader, in NetworkContext context)
|
||||
public bool Deserialize(FastBufferReader reader, ref NetworkContext context)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Handle(ref NetworkContext context)
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -45,7 +49,7 @@ namespace Unity.Netcode.EditorTests
|
||||
new MessagingSystem.MessageWithHandler
|
||||
{
|
||||
MessageType = typeof(TestMessage),
|
||||
Handler = TestMessage.Receive
|
||||
Handler = MessagingSystem.ReceiveMessage<TestMessage>
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -86,7 +90,7 @@ namespace Unity.Netcode.EditorTests
|
||||
public void WhenSendingMessage_SerializeIsCalled()
|
||||
{
|
||||
var message = GetMessage();
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
Assert.IsTrue(TestMessage.Serialized);
|
||||
}
|
||||
|
||||
@@ -94,7 +98,7 @@ namespace Unity.Netcode.EditorTests
|
||||
public void WhenSendingMessage_NothingIsSentBeforeProcessingSendQueue()
|
||||
{
|
||||
var message = GetMessage();
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
Assert.IsEmpty(m_MessageSender.MessageQueue);
|
||||
}
|
||||
|
||||
@@ -102,7 +106,7 @@ namespace Unity.Netcode.EditorTests
|
||||
public void WhenProcessingSendQueue_MessageIsSent()
|
||||
{
|
||||
var message = GetMessage();
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
|
||||
m_MessagingSystem.ProcessSendQueues();
|
||||
Assert.AreEqual(1, m_MessageSender.MessageQueue.Count);
|
||||
@@ -112,9 +116,9 @@ namespace Unity.Netcode.EditorTests
|
||||
public void WhenSendingMultipleMessages_MessagesAreBatched()
|
||||
{
|
||||
var message = GetMessage();
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
|
||||
m_MessagingSystem.ProcessSendQueues();
|
||||
Assert.AreEqual(1, m_MessageSender.MessageQueue.Count);
|
||||
@@ -127,7 +131,7 @@ namespace Unity.Netcode.EditorTests
|
||||
var size = UnsafeUtility.SizeOf<TestMessage>() + 2; // MessageHeader packed with this message will be 2 bytes
|
||||
for (var i = 0; i < 1300 / size; ++i)
|
||||
{
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
}
|
||||
|
||||
m_MessagingSystem.ProcessSendQueues();
|
||||
@@ -141,7 +145,7 @@ namespace Unity.Netcode.EditorTests
|
||||
var size = UnsafeUtility.SizeOf<TestMessage>() + 2; // MessageHeader packed with this message will be 2 bytes
|
||||
for (var i = 0; i < (1300 / size) + 1; ++i)
|
||||
{
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
}
|
||||
|
||||
m_MessagingSystem.ProcessSendQueues();
|
||||
@@ -155,7 +159,7 @@ namespace Unity.Netcode.EditorTests
|
||||
var size = UnsafeUtility.SizeOf<TestMessage>() + 2; // MessageHeader packed with this message will be 2 bytes
|
||||
for (var i = 0; i < (1300 / size) + 1; ++i)
|
||||
{
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.ReliableFragmentedSequenced, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, m_Clients);
|
||||
}
|
||||
|
||||
m_MessagingSystem.ProcessSendQueues();
|
||||
@@ -166,9 +170,9 @@ namespace Unity.Netcode.EditorTests
|
||||
public void WhenSwitchingDelivery_NewBatchesAreCreated()
|
||||
{
|
||||
var message = GetMessage();
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Unreliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Unreliable, m_Clients);
|
||||
|
||||
m_MessagingSystem.ProcessSendQueues();
|
||||
Assert.AreEqual(2, m_MessageSender.MessageQueue.Count);
|
||||
@@ -178,9 +182,9 @@ namespace Unity.Netcode.EditorTests
|
||||
public void WhenSwitchingChannel_NewBatchesAreNotCreated()
|
||||
{
|
||||
var message = GetMessage();
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
|
||||
m_MessagingSystem.ProcessSendQueues();
|
||||
Assert.AreEqual(1, m_MessageSender.MessageQueue.Count);
|
||||
@@ -191,8 +195,8 @@ namespace Unity.Netcode.EditorTests
|
||||
{
|
||||
var message = GetMessage();
|
||||
var message2 = GetMessage();
|
||||
m_MessagingSystem.SendMessage(message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(message2, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message, NetworkDelivery.Reliable, m_Clients);
|
||||
m_MessagingSystem.SendMessage(ref message2, NetworkDelivery.Reliable, m_Clients);
|
||||
|
||||
m_MessagingSystem.ProcessSendQueues();
|
||||
var reader = new FastBufferReader(m_MessageSender.MessageQueue[0], Allocator.Temp);
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Unity.Netcode.EditorTests
|
||||
{
|
||||
public class NetworkManagerCustomMessageManagerTests
|
||||
{
|
||||
[Test]
|
||||
public void CustomMessageManagerAssigned()
|
||||
{
|
||||
var gameObject = new GameObject(nameof(CustomMessageManagerAssigned));
|
||||
var networkManager = gameObject.AddComponent<NetworkManager>();
|
||||
var transport = gameObject.AddComponent<DummyTransport>();
|
||||
|
||||
networkManager.NetworkConfig = new NetworkConfig();
|
||||
// Set dummy transport that does nothing
|
||||
networkManager.NetworkConfig.NetworkTransport = transport;
|
||||
|
||||
CustomMessagingManager preManager = networkManager.CustomMessagingManager;
|
||||
|
||||
// Start server to cause initialization
|
||||
networkManager.StartServer();
|
||||
|
||||
Debug.Assert(preManager == null);
|
||||
Debug.Assert(networkManager.CustomMessagingManager != null);
|
||||
|
||||
Object.DestroyImmediate(gameObject);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 315ffe39806441839400d21871d566a0
|
||||
timeCreated: 1618478909
|
||||
@@ -1,54 +0,0 @@
|
||||
using System;
|
||||
using Unity.Netcode.Editor;
|
||||
|
||||
namespace Unity.Netcode.EditorTests
|
||||
{
|
||||
// Should probably have one of these for more files? In the future we could use the SIPTransport?
|
||||
[DontShowInTransportDropdown]
|
||||
internal class DummyTransport : NetworkTransport
|
||||
{
|
||||
public override ulong ServerClientId { get; } = 0;
|
||||
public override void Send(ulong clientId, ArraySegment<byte> payload, NetworkDelivery networkDelivery)
|
||||
{
|
||||
}
|
||||
|
||||
public override NetworkEvent PollEvent(out ulong clientId, out ArraySegment<byte> payload, out float receiveTime)
|
||||
{
|
||||
clientId = 0;
|
||||
payload = new ArraySegment<byte>();
|
||||
receiveTime = 0;
|
||||
return NetworkEvent.Nothing;
|
||||
}
|
||||
|
||||
public override bool StartClient()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public override bool StartServer()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public override void DisconnectRemoteClient(ulong clientId)
|
||||
{
|
||||
}
|
||||
|
||||
public override void DisconnectLocalClient()
|
||||
{
|
||||
}
|
||||
|
||||
public override ulong GetCurrentRtt(ulong clientId)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
public override void Shutdown()
|
||||
{
|
||||
}
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 976ca592c7fa4bcb854203dfbadc0ad9
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,29 +0,0 @@
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Unity.Netcode.EditorTests
|
||||
{
|
||||
public class NetworkManagerSceneManagerTests
|
||||
{
|
||||
[Test]
|
||||
public void SceneManagerAssigned()
|
||||
{
|
||||
var gameObject = new GameObject(nameof(SceneManagerAssigned));
|
||||
var networkManager = gameObject.AddComponent<NetworkManager>();
|
||||
var transport = gameObject.AddComponent<DummyTransport>();
|
||||
networkManager.NetworkConfig = new NetworkConfig();
|
||||
// Set dummy transport that does nothing
|
||||
networkManager.NetworkConfig.NetworkTransport = transport;
|
||||
|
||||
NetworkSceneManager preManager = networkManager.SceneManager;
|
||||
|
||||
// Start server to cause initialization process
|
||||
networkManager.StartServer();
|
||||
|
||||
Debug.Assert(preManager == null);
|
||||
Debug.Assert(networkManager.SceneManager != null);
|
||||
|
||||
Object.DestroyImmediate(gameObject);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9753bf4088484cbebee95d917699dec6
|
||||
timeCreated: 1618482634
|
||||
@@ -1,3 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
fileFormatVersion: 2
|
||||
guid: e12c4be6e89f459aa2826abba8c8d301
|
||||
timeCreated: 1628799671
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@@ -3,7 +3,7 @@ using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
using Random = System.Random;
|
||||
|
||||
namespace Unity.Netcode
|
||||
namespace Unity.Netcode.EditorTests
|
||||
{
|
||||
public abstract class BaseFastBufferReaderWriterTest
|
||||
{
|
||||
|
||||
@@ -346,6 +346,52 @@ namespace Unity.Netcode.EditorTests
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WhenCreatingAReaderFromAnEmptyArraySegment_LengthIsZero()
|
||||
{
|
||||
var bytes = new byte[] { };
|
||||
var input = new ArraySegment<byte>(bytes, 0, 0);
|
||||
using var reader = new FastBufferReader(input, Allocator.Temp);
|
||||
Assert.AreEqual(0, reader.Length);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WhenCreatingAReaderFromAnEmptyArray_LengthIsZero()
|
||||
{
|
||||
var input = new byte[] { };
|
||||
using var reader = new FastBufferReader(input, Allocator.Temp);
|
||||
Assert.AreEqual(0, reader.Length);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WhenCreatingAReaderFromAnEmptyNativeArray_LengthIsZero()
|
||||
{
|
||||
var input = new NativeArray<byte>(0, Allocator.Temp);
|
||||
using var reader = new FastBufferReader(input, Allocator.Temp);
|
||||
Assert.AreEqual(0, reader.Length);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WhenCreatingAReaderFromAnEmptyFastBufferWriter_LengthIsZero()
|
||||
{
|
||||
var input = new FastBufferWriter(0, Allocator.Temp);
|
||||
using var reader = new FastBufferReader(input, Allocator.Temp);
|
||||
Assert.AreEqual(0, reader.Length);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WhenCreatingAReaderFromAnEmptyBuffer_LengthIsZero()
|
||||
{
|
||||
var input = new byte[] { };
|
||||
unsafe
|
||||
{
|
||||
fixed (byte* ptr = input)
|
||||
{
|
||||
using var reader = new FastBufferReader(ptr, Allocator.Temp, 0);
|
||||
Assert.AreEqual(0, reader.Length);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WhenCallingReadByteWithoutCallingTryBeingReadFirst_OverflowExceptionIsThrown()
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace Unity.Netcode.EditorTests
|
||||
return 0;
|
||||
}
|
||||
|
||||
internal int SendMessage(in SnapshotDataMessage message, NetworkDelivery delivery, ulong clientId)
|
||||
internal int SendMessage(ref SnapshotDataMessage message, NetworkDelivery delivery, ulong clientId)
|
||||
{
|
||||
if (!m_PassBackResponses)
|
||||
{
|
||||
@@ -106,19 +106,15 @@ namespace Unity.Netcode.EditorTests
|
||||
message.Serialize(writer);
|
||||
using var reader = new FastBufferReader(writer, Allocator.Temp);
|
||||
var context = new NetworkContext { SenderId = 0, Timestamp = 0.0f, SystemOwner = new Tuple<SnapshotSystem, ulong>(m_RecvSnapshot, 0) };
|
||||
SnapshotDataMessage.Receive(reader, context);
|
||||
}
|
||||
else
|
||||
{
|
||||
message.Spawns.Dispose();
|
||||
message.Despawns.Dispose();
|
||||
message.Entries.Dispose();
|
||||
var newMessage = new SnapshotDataMessage();
|
||||
newMessage.Deserialize(reader, ref context);
|
||||
newMessage.Handle(ref context);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
internal int SendMessageRecvSide(in SnapshotDataMessage message, NetworkDelivery delivery, ulong clientId)
|
||||
internal int SendMessageRecvSide(ref SnapshotDataMessage message, NetworkDelivery delivery, ulong clientId)
|
||||
{
|
||||
if (m_PassBackResponses)
|
||||
{
|
||||
@@ -126,13 +122,9 @@ namespace Unity.Netcode.EditorTests
|
||||
message.Serialize(writer);
|
||||
using var reader = new FastBufferReader(writer, Allocator.Temp);
|
||||
var context = new NetworkContext { SenderId = 0, Timestamp = 0.0f, SystemOwner = new Tuple<SnapshotSystem, ulong>(m_SendSnapshot, 1) };
|
||||
SnapshotDataMessage.Receive(reader, context);
|
||||
}
|
||||
else
|
||||
{
|
||||
message.Spawns.Dispose();
|
||||
message.Despawns.Dispose();
|
||||
message.Entries.Dispose();
|
||||
var newMessage = new SnapshotDataMessage();
|
||||
newMessage.Deserialize(reader, ref context);
|
||||
newMessage.Handle(ref context);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -369,4 +361,3 @@ namespace Unity.Netcode.EditorTests
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Unity.Netcode.EditorTests
|
||||
{
|
||||
public class StartStopTests
|
||||
{
|
||||
private NetworkManager m_NetworkManager;
|
||||
|
||||
[SetUp]
|
||||
public void Setup()
|
||||
{
|
||||
// Create the reusable NetworkManager
|
||||
m_NetworkManager = new GameObject(nameof(NetworkManager)).AddComponent<NetworkManager>();
|
||||
var transport = m_NetworkManager.gameObject.AddComponent<DummyTransport>();
|
||||
|
||||
m_NetworkManager.NetworkConfig = new NetworkConfig()
|
||||
{
|
||||
NetworkTransport = transport
|
||||
};
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestStopAndRestartForExceptions()
|
||||
{
|
||||
m_NetworkManager.StartServer();
|
||||
m_NetworkManager.Shutdown();
|
||||
m_NetworkManager.StartServer();
|
||||
m_NetworkManager.Shutdown();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestStartupServerState()
|
||||
{
|
||||
m_NetworkManager.StartServer();
|
||||
|
||||
Assert.True(m_NetworkManager.IsServer);
|
||||
Assert.False(m_NetworkManager.IsClient);
|
||||
Assert.False(m_NetworkManager.IsHost);
|
||||
|
||||
m_NetworkManager.Shutdown();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestFlagShutdown()
|
||||
{
|
||||
m_NetworkManager.StartServer();
|
||||
m_NetworkManager.ShutdownInternal();
|
||||
|
||||
Assert.False(m_NetworkManager.IsServer);
|
||||
Assert.False(m_NetworkManager.IsClient);
|
||||
Assert.False(m_NetworkManager.IsHost);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestShutdownWithoutStartForExceptions()
|
||||
{
|
||||
m_NetworkManager.ShutdownInternal();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestShutdownWithoutConfigForExceptions()
|
||||
{
|
||||
m_NetworkManager.NetworkConfig = null;
|
||||
m_NetworkManager.ShutdownInternal();
|
||||
}
|
||||
|
||||
[TearDown]
|
||||
public void Teardown()
|
||||
{
|
||||
// Cleanup
|
||||
Object.DestroyImmediate(m_NetworkManager.gameObject);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e8e36047cb5542bcaade2a9a8746d713
|
||||
timeCreated: 1630336158
|
||||
@@ -7,7 +7,9 @@
|
||||
"Unity.Netcode.Editor",
|
||||
"Unity.Netcode.Components",
|
||||
"Unity.Multiplayer.MetricTypes",
|
||||
"Unity.Multiplayer.NetStats"
|
||||
"Unity.Multiplayer.NetStats",
|
||||
"Unity.Multiplayer.Tools.MetricTypes",
|
||||
"Unity.Multiplayer.Tools.NetStats"
|
||||
],
|
||||
"optionalUnityReferences": [
|
||||
"TestAssemblies"
|
||||
@@ -15,18 +17,7 @@
|
||||
"includePlatforms": [
|
||||
"Editor"
|
||||
],
|
||||
"excludePlatforms": [],
|
||||
"allowUnsafeCode": true,
|
||||
"overrideReferences": true,
|
||||
"precompiledReferences": [
|
||||
"nunit.framework.dll"
|
||||
],
|
||||
"autoReferenced": false,
|
||||
"defineConstraints": [
|
||||
"UNITY_INCLUDE_TESTS"
|
||||
],
|
||||
"versionDefines": [],
|
||||
"noEngineReferences": false,
|
||||
"versionDefines": [
|
||||
{
|
||||
"name": "com.unity.multiplayer.tools",
|
||||
|
||||
Reference in New Issue
Block a user