From 969f754c9b3bdc34c760c4e2738eb02242711785 Mon Sep 17 00:00:00 2001 From: Matt Walsh Date: Wed, 25 Aug 2021 15:08:49 -0700 Subject: [PATCH] chore!: remove netvar predefined types --- .../NetworkVariable/NetworkVariable.cs | 342 ------------------ .../NetworkVariableTestComponent.cs | 183 +++++----- .../Runtime/NetworkBehaviourUpdaterTests.cs | 18 +- testproject/Assets/Scripts/SyncTransform.cs | 2 +- .../NetworkVariablePerformanceTests.cs | 2 +- 5 files changed, 101 insertions(+), 446 deletions(-) diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs index 77399a636e..e631bdcef7 100644 --- a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs +++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs @@ -142,346 +142,4 @@ public override void WriteField(Stream stream) } } } - - /// - /// A NetworkVariable that holds bools and support serialization - /// - [Serializable] - public class NetworkVariableBool : NetworkVariable - { - /// - public NetworkVariableBool() { } - - /// - public NetworkVariableBool(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableBool(bool value) : base(value) { } - - /// - public NetworkVariableBool(NetworkVariableSettings settings, bool value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds bytes and support serialization - /// - [Serializable] - public class NetworkVariableByte : NetworkVariable - { - /// - public NetworkVariableByte() { } - - /// - public NetworkVariableByte(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableByte(byte value) : base(value) { } - - /// - public NetworkVariableByte(NetworkVariableSettings settings, byte value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds sbytes and support serialization - /// - [Serializable] - public class NetworkVariableSByte : NetworkVariable - { - /// - public NetworkVariableSByte() { } - - /// - public NetworkVariableSByte(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableSByte(sbyte value) : base(value) { } - - /// - public NetworkVariableSByte(NetworkVariableSettings settings, sbyte value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds ushorts and support serialization - /// - [Serializable] - public class NetworkVariableUShort : NetworkVariable - { - /// - public NetworkVariableUShort() { } - - /// - public NetworkVariableUShort(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableUShort(ushort value) : base(value) { } - - /// - public NetworkVariableUShort(NetworkVariableSettings settings, ushort value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds shorts and support serialization - /// - [Serializable] - public class NetworkVariableShort : NetworkVariable - { - /// - public NetworkVariableShort() { } - - /// - public NetworkVariableShort(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableShort(short value) : base(value) { } - - /// - public NetworkVariableShort(NetworkVariableSettings settings, short value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds uints and support serialization - /// - [Serializable] - public class NetworkVariableUInt : NetworkVariable - { - /// - public NetworkVariableUInt() { } - - /// - public NetworkVariableUInt(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableUInt(uint value) : base(value) { } - - /// - public NetworkVariableUInt(NetworkVariableSettings settings, uint value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds ints and support serialization - /// - [Serializable] - public class NetworkVariableInt : NetworkVariable - { - /// - public NetworkVariableInt() { } - - /// - public NetworkVariableInt(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableInt(int value) : base(value) { } - - /// - public NetworkVariableInt(NetworkVariableSettings settings, int value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds ulongs and support serialization - /// - [Serializable] - public class NetworkVariableULong : NetworkVariable - { - /// - public NetworkVariableULong() { } - - /// - public NetworkVariableULong(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableULong(ulong value) : base(value) { } - - /// - public NetworkVariableULong(NetworkVariableSettings settings, ulong value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds longs and support serialization - /// - [Serializable] - public class NetworkVariableLong : NetworkVariable - { - /// - public NetworkVariableLong() { } - - /// - public NetworkVariableLong(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableLong(long value) : base(value) { } - - /// - public NetworkVariableLong(NetworkVariableSettings settings, long value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds floats and support serialization - /// - [Serializable] - public class NetworkVariableFloat : NetworkVariable - { - /// - public NetworkVariableFloat() { } - - /// - public NetworkVariableFloat(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableFloat(float value) : base(value) { } - - /// - public NetworkVariableFloat(NetworkVariableSettings settings, float value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds doubles and support serialization - /// - [Serializable] - public class NetworkVariableDouble : NetworkVariable - { - /// - public NetworkVariableDouble() { } - - /// - public NetworkVariableDouble(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableDouble(double value) : base(value) { } - - /// - public NetworkVariableDouble(NetworkVariableSettings settings, double value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds vector2s and support serialization - /// - [Serializable] - public class NetworkVariableVector2 : NetworkVariable - { - /// - public NetworkVariableVector2() { } - - /// - public NetworkVariableVector2(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableVector2(Vector2 value) : base(value) { } - - /// - public NetworkVariableVector2(NetworkVariableSettings settings, Vector2 value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds vector3s and support serialization - /// - [Serializable] - public class NetworkVariableVector3 : NetworkVariable - { - /// - public NetworkVariableVector3() { } - - /// - public NetworkVariableVector3(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableVector3(Vector3 value) : base(value) { } - - /// - public NetworkVariableVector3(NetworkVariableSettings settings, Vector3 value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds vector4s and support serialization - /// - [Serializable] - public class NetworkVariableVector4 : NetworkVariable - { - /// - public NetworkVariableVector4() { } - - /// - public NetworkVariableVector4(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableVector4(Vector4 value) : base(value) { } - - /// - public NetworkVariableVector4(NetworkVariableSettings settings, Vector4 value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds colors and support serialization - /// - [Serializable] - public class NetworkVariableColor : NetworkVariable - { - /// - public NetworkVariableColor() { } - - /// - public NetworkVariableColor(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableColor(Color value) : base(value) { } - - /// - public NetworkVariableColor(NetworkVariableSettings settings, Color value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds color32s and support serialization - /// - [Serializable] - public class NetworkVariableColor32 : NetworkVariable - { - /// - public NetworkVariableColor32() { } - - /// - public NetworkVariableColor32(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableColor32(Color32 value) : base(value) { } - - /// - public NetworkVariableColor32(NetworkVariableSettings settings, Color32 value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds rays and support serialization - /// - [Serializable] - public class NetworkVariableRay : NetworkVariable - { - /// - public NetworkVariableRay() { } - - /// - public NetworkVariableRay(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableRay(Ray value) : base(value) { } - - /// - public NetworkVariableRay(NetworkVariableSettings settings, Ray value) : base(settings, value) { } - } - - /// - /// A NetworkVariable that holds quaternions and support serialization - /// - [Serializable] - public class NetworkVariableQuaternion : NetworkVariable - { - /// - public NetworkVariableQuaternion() { } - - /// - public NetworkVariableQuaternion(NetworkVariableSettings settings) : base(settings) { } - - /// - public NetworkVariableQuaternion(Quaternion value) : base(value) { } - - /// - public NetworkVariableQuaternion(NetworkVariableSettings settings, Quaternion value) : base(settings, value) { } - } } diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs index 446918684c..5115083e18 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs @@ -11,24 +11,24 @@ namespace Unity.Netcode.RuntimeTests /// internal class NetworkVariableTestComponent : NetworkBehaviour { - private NetworkVariableBool m_NetworkVariableBool; - private NetworkVariableByte m_NetworkVariableByte; - private NetworkVariableColor m_NetworkVariableColor; - private NetworkVariableColor32 m_NetworkVariableColor32; - private NetworkVariableDouble m_NetworkVariableDouble; - private NetworkVariableFloat m_NetworkVariableFloat; - private NetworkVariableInt m_NetworkVariableInt; - private NetworkVariableLong m_NetworkVariableLong; - private NetworkVariableSByte m_NetworkVariableSByte; - private NetworkVariableQuaternion m_NetworkVariableQuaternion; - private NetworkVariableShort m_NetworkVariableShort; - private NetworkVariableVector4 m_NetworkVariableVector4; - private NetworkVariableVector3 m_NetworkVariableVector3; - private NetworkVariableVector2 m_NetworkVariableVector2; - private NetworkVariableRay m_NetworkVariableRay; - private NetworkVariableULong m_NetworkVariableULong; - private NetworkVariableUInt m_NetworkVariableUInt; - private NetworkVariableUShort m_NetworkVariableUShort; + private NetworkVariable m_NetworkVariableBool; + private NetworkVariable m_NetworkVariableByte; + private NetworkVariable m_NetworkVariableColor; + private NetworkVariable m_NetworkVariableColor32; + private NetworkVariable m_NetworkVariableDouble; + private NetworkVariable m_NetworkVariableFloat; + private NetworkVariable m_NetworkVariableInt; + private NetworkVariable m_NetworkVariableLong; + private NetworkVariable m_NetworkVariableSByte; + private NetworkVariable m_NetworkVariableQuaternion; + private NetworkVariable m_NetworkVariableShort; + private NetworkVariable m_NetworkVariableVector4; + private NetworkVariable m_NetworkVariableVector3; + private NetworkVariable m_NetworkVariableVector2; + private NetworkVariable m_NetworkVariableRay; + private NetworkVariable m_NetworkVariableULong; + private NetworkVariable m_NetworkVariableUInt; + private NetworkVariable m_NetworkVariableUShort; public NetworkVariableHelper Bool_Var; @@ -62,91 +62,89 @@ internal class NetworkVariableTestComponent : NetworkBehaviour private void InitializeTest() { // Generic Constructor Test Coverage - m_NetworkVariableBool = new NetworkVariableBool(); - m_NetworkVariableByte = new NetworkVariableByte(); - m_NetworkVariableColor = new NetworkVariableColor(); - m_NetworkVariableColor32 = new NetworkVariableColor32(); - m_NetworkVariableDouble = new NetworkVariableDouble(); - m_NetworkVariableFloat = new NetworkVariableFloat(); - m_NetworkVariableInt = new NetworkVariableInt(); - m_NetworkVariableLong = new NetworkVariableLong(); - m_NetworkVariableSByte = new NetworkVariableSByte(); - m_NetworkVariableQuaternion = new NetworkVariableQuaternion(); - m_NetworkVariableShort = new NetworkVariableShort(); - m_NetworkVariableVector4 = new NetworkVariableVector4(); - m_NetworkVariableVector3 = new NetworkVariableVector3(); - m_NetworkVariableVector2 = new NetworkVariableVector2(); - m_NetworkVariableRay = new NetworkVariableRay(); - m_NetworkVariableULong = new NetworkVariableULong(); - m_NetworkVariableUInt = new NetworkVariableUInt(); - m_NetworkVariableUShort = new NetworkVariableUShort(); + m_NetworkVariableBool = new NetworkVariable(); + m_NetworkVariableByte = new NetworkVariable(); + m_NetworkVariableColor = new NetworkVariable(); + m_NetworkVariableColor32 = new NetworkVariable(); + m_NetworkVariableDouble = new NetworkVariable(); + m_NetworkVariableFloat = new NetworkVariable(); + m_NetworkVariableInt = new NetworkVariable(); + m_NetworkVariableLong = new NetworkVariable(); + m_NetworkVariableSByte = new NetworkVariable(); + m_NetworkVariableQuaternion = new NetworkVariable(); + m_NetworkVariableShort = new NetworkVariable(); + m_NetworkVariableVector4 = new NetworkVariable(); + m_NetworkVariableVector3 = new NetworkVariable(); + m_NetworkVariableVector2 = new NetworkVariable(); + m_NetworkVariableRay = new NetworkVariable(); + m_NetworkVariableULong = new NetworkVariable(); + m_NetworkVariableUInt = new NetworkVariable(); + m_NetworkVariableUShort = new NetworkVariable(); // NetworkVariable Value Type Constructor Test Coverage - m_NetworkVariableBool = new NetworkVariableBool(true); - m_NetworkVariableByte = new NetworkVariableByte(0); - m_NetworkVariableColor = new NetworkVariableColor(new Color(1, 1, 1, 1)); - m_NetworkVariableColor32 = new NetworkVariableColor32(new Color32(1, 1, 1, 1)); - m_NetworkVariableDouble = new NetworkVariableDouble(1.0); - m_NetworkVariableFloat = new NetworkVariableFloat(1.0f); - m_NetworkVariableInt = new NetworkVariableInt(1); - m_NetworkVariableLong = new NetworkVariableLong(1); - m_NetworkVariableSByte = new NetworkVariableSByte(0); - m_NetworkVariableQuaternion = new NetworkVariableQuaternion(Quaternion.identity); - m_NetworkVariableShort = new NetworkVariableShort(256); - m_NetworkVariableVector4 = new NetworkVariableVector4(new Vector4(1, 1, 1, 1)); - m_NetworkVariableVector3 = new NetworkVariableVector3(new Vector3(1, 1, 1)); - m_NetworkVariableVector2 = new NetworkVariableVector2(new Vector2(1, 1)); - m_NetworkVariableRay = new NetworkVariableRay(new Ray()); - m_NetworkVariableULong = new NetworkVariableULong(1); - m_NetworkVariableUInt = new NetworkVariableUInt(1); - m_NetworkVariableUShort = new NetworkVariableUShort(1); + m_NetworkVariableBool = new NetworkVariable(true); + m_NetworkVariableByte = new NetworkVariable(0); + m_NetworkVariableColor = new NetworkVariable(new Color(1, 1, 1, 1)); + m_NetworkVariableColor32 = new NetworkVariable(new Color32(1, 1, 1, 1)); + m_NetworkVariableDouble = new NetworkVariable(1.0); + m_NetworkVariableFloat = new NetworkVariable(1.0f); + m_NetworkVariableInt = new NetworkVariable(1); + m_NetworkVariableLong = new NetworkVariable(1); + m_NetworkVariableSByte = new NetworkVariable(0); + m_NetworkVariableQuaternion = new NetworkVariable(Quaternion.identity); + m_NetworkVariableShort = new NetworkVariable(256); + m_NetworkVariableVector4 = new NetworkVariable(new Vector4(1, 1, 1, 1)); + m_NetworkVariableVector3 = new NetworkVariable(new Vector3(1, 1, 1)); + m_NetworkVariableVector2 = new NetworkVariable(new Vector2(1, 1)); + m_NetworkVariableRay = new NetworkVariable(new Ray()); + m_NetworkVariableULong = new NetworkVariable(1); + m_NetworkVariableUInt = new NetworkVariable(1); + m_NetworkVariableUShort = new NetworkVariable(1); // NetworkVariable NetworkVariableSettings Constructor Test Coverage var settings = new NetworkVariableSettings(); settings.ReadPermission = NetworkVariableReadPermission.Everyone; - m_NetworkVariableBool = new NetworkVariableBool(settings); - m_NetworkVariableByte = new NetworkVariableByte(settings); - m_NetworkVariableColor = new NetworkVariableColor(settings); - m_NetworkVariableColor32 = new NetworkVariableColor32(settings); - m_NetworkVariableDouble = new NetworkVariableDouble(settings); - m_NetworkVariableFloat = new NetworkVariableFloat(settings); - m_NetworkVariableInt = new NetworkVariableInt(settings); - m_NetworkVariableLong = new NetworkVariableLong(settings); - m_NetworkVariableSByte = new NetworkVariableSByte(settings); - m_NetworkVariableQuaternion = new NetworkVariableQuaternion(settings); - m_NetworkVariableShort = new NetworkVariableShort(settings); - m_NetworkVariableVector4 = new NetworkVariableVector4(settings); - m_NetworkVariableVector3 = new NetworkVariableVector3(settings); - m_NetworkVariableVector2 = new NetworkVariableVector2(settings); - m_NetworkVariableRay = new NetworkVariableRay(settings); - m_NetworkVariableULong = new NetworkVariableULong(settings); - m_NetworkVariableUInt = new NetworkVariableUInt(settings); - m_NetworkVariableUShort = new NetworkVariableUShort(settings); + m_NetworkVariableBool = new NetworkVariable(settings); + m_NetworkVariableByte = new NetworkVariable(settings); + m_NetworkVariableColor = new NetworkVariable(settings); + m_NetworkVariableColor32 = new NetworkVariable(settings); + m_NetworkVariableDouble = new NetworkVariable(settings); + m_NetworkVariableFloat = new NetworkVariable(settings); + m_NetworkVariableInt = new NetworkVariable(settings); + m_NetworkVariableLong = new NetworkVariable(settings); + m_NetworkVariableSByte = new NetworkVariable(settings); + m_NetworkVariableQuaternion = new NetworkVariable(settings); + m_NetworkVariableShort = new NetworkVariable(settings); + m_NetworkVariableVector4 = new NetworkVariable(settings); + m_NetworkVariableVector3 = new NetworkVariable(settings); + m_NetworkVariableVector2 = new NetworkVariable(settings); + m_NetworkVariableRay = new NetworkVariable(settings); + m_NetworkVariableULong = new NetworkVariable(settings); + m_NetworkVariableUInt = new NetworkVariable(settings); + m_NetworkVariableUShort = new NetworkVariable(settings); // NetworkVariable Value Type and NetworkVariableSettings Constructor Test Coverage - m_NetworkVariableBool = new NetworkVariableBool(settings, true); - m_NetworkVariableByte = new NetworkVariableByte(settings, 0); - m_NetworkVariableColor = new NetworkVariableColor(settings, new Color(1, 1, 1, 1)); - m_NetworkVariableColor32 = new NetworkVariableColor32(settings, new Color32(1, 1, 1, 1)); - m_NetworkVariableDouble = new NetworkVariableDouble(settings, 1.0); - m_NetworkVariableFloat = new NetworkVariableFloat(settings, 1.0f); - m_NetworkVariableInt = new NetworkVariableInt(settings, 1); - m_NetworkVariableLong = new NetworkVariableLong(settings, 1); - m_NetworkVariableSByte = new NetworkVariableSByte(settings, 0); - m_NetworkVariableQuaternion = new NetworkVariableQuaternion(settings, Quaternion.identity); - m_NetworkVariableShort = new NetworkVariableShort(settings, 1); - m_NetworkVariableVector4 = new NetworkVariableVector4(settings, new Vector4(1, 1, 1, 1)); - m_NetworkVariableVector3 = new NetworkVariableVector3(settings, new Vector3(1, 1, 1)); - m_NetworkVariableVector2 = new NetworkVariableVector2(settings, new Vector2(1, 1)); - m_NetworkVariableRay = new NetworkVariableRay(settings, new Ray()); - m_NetworkVariableULong = new NetworkVariableULong(settings, 1); - m_NetworkVariableUInt = new NetworkVariableUInt(settings, 1); - m_NetworkVariableUShort = new NetworkVariableUShort(settings, 1); - - + m_NetworkVariableBool = new NetworkVariable(settings, true); + m_NetworkVariableByte = new NetworkVariable(settings, 0); + m_NetworkVariableColor = new NetworkVariable(settings, new Color(1, 1, 1, 1)); + m_NetworkVariableColor32 = new NetworkVariable(settings, new Color32(1, 1, 1, 1)); + m_NetworkVariableDouble = new NetworkVariable(settings, 1.0); + m_NetworkVariableFloat = new NetworkVariable(settings, 1.0f); + m_NetworkVariableInt = new NetworkVariable(settings, 1); + m_NetworkVariableLong = new NetworkVariable(settings, 1); + m_NetworkVariableSByte = new NetworkVariable(settings, 0); + m_NetworkVariableQuaternion = new NetworkVariable(settings, Quaternion.identity); + m_NetworkVariableShort = new NetworkVariable(settings, 1); + m_NetworkVariableVector4 = new NetworkVariable(settings, new Vector4(1, 1, 1, 1)); + m_NetworkVariableVector3 = new NetworkVariable(settings, new Vector3(1, 1, 1)); + m_NetworkVariableVector2 = new NetworkVariable(settings, new Vector2(1, 1)); + m_NetworkVariableRay = new NetworkVariable(settings, new Ray()); + m_NetworkVariableULong = new NetworkVariable(settings, 1); + m_NetworkVariableUInt = new NetworkVariable(settings, 1); + m_NetworkVariableUShort = new NetworkVariable(settings, 1); // Use this nifty class: NetworkVariableHelper // Tracks if NetworkVariable changed invokes the OnValueChanged callback for the given instance type @@ -168,7 +166,6 @@ private void InitializeTest() Ulong_Var = new NetworkVariableHelper(m_NetworkVariableULong); Uint_Var = new NetworkVariableHelper(m_NetworkVariableUInt); Ushort_Var = new NetworkVariableHelper(m_NetworkVariableUShort); - } /// diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs index 6efcf68ed3..f884eb5c45 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs +++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs @@ -85,7 +85,7 @@ void AddNetworkBehaviour(Type type, GameObject prefab) yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientsConnectedToServer(server, clientCount: useHost ? nbClients + 1 : nbClients)); // gathering netvars to test on - var serverNetVarsToUpdate = new List(); + var serverNetVarsToUpdate = new List>(); for (int i = 0; i < nbSpawnedObjects; i++) { var spawnedObject = Object.Instantiate(prefabToSpawn); @@ -138,7 +138,7 @@ void AddNetworkBehaviour(Type type, GameObject prefab) { foreach (var networkVariable in behaviour.NetworkVariableFields) { - var varInt = networkVariable as NetworkVariableInt; + var varInt = networkVariable as NetworkVariable; var varUpdateResult = new MultiInstanceHelpers.CoroutineResultWrapper(); yield return MultiInstanceHelpers.WaitForCondition(() => varInt.Value == updatedValue, varUpdateResult); Assert.That(varUpdateResult.Result, Is.True); @@ -155,24 +155,24 @@ void AddNetworkBehaviour(Type type, GameObject prefab) public interface INetVarInfo { - public List AllNetVars { get; } + public List> AllNetVars { get; } } public class ZeroNetVar : NetworkBehaviour, INetVarInfo { - public List AllNetVars => new List(); // Needed to be independant from NetworkBehaviour's list of fields. This way, if that changes, we can still do this validation in this test + public List> AllNetVars => new List>(); // Needed to be independant from NetworkBehaviour's list of fields. This way, if that changes, we can still do this validation in this test } public class OneNetVar : NetworkBehaviour, INetVarInfo { - private NetworkVariableInt m_SomeValue = new NetworkVariableInt(); - public List AllNetVars => new List() { m_SomeValue }; + private NetworkVariable m_SomeValue = new NetworkVariable(); + public List> AllNetVars => new List>() { m_SomeValue }; } public class TwoNetVar : NetworkBehaviour, INetVarInfo { - private NetworkVariableInt m_SomeValue = new NetworkVariableInt(); - private NetworkVariableInt m_SomeOtherValue = new NetworkVariableInt(); - public List AllNetVars => new List() { m_SomeValue, m_SomeOtherValue }; + private NetworkVariable m_SomeValue = new NetworkVariable(); + private NetworkVariable m_SomeOtherValue = new NetworkVariable(); + public List> AllNetVars => new List>() { m_SomeValue, m_SomeOtherValue }; } } diff --git a/testproject/Assets/Scripts/SyncTransform.cs b/testproject/Assets/Scripts/SyncTransform.cs index 4b47b3b18b..e8fc76cf98 100644 --- a/testproject/Assets/Scripts/SyncTransform.cs +++ b/testproject/Assets/Scripts/SyncTransform.cs @@ -12,7 +12,7 @@ namespace Unity.Netcode public class SyncTransform : NetworkBehaviour { private NetworkVariable m_VarPos = new NetworkVariable(); - private NetworkVariableQuaternion m_VarRot = new NetworkVariableQuaternion(); + private NetworkVariable m_VarRot = new NetworkVariable(); private const float k_Epsilon = 0.001f; private bool m_Interpolate = true; diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/NetworkVariablePerformanceTests.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/NetworkVariablePerformanceTests.cs index dbf8e48e57..9cc1d5f5b9 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/NetworkVariablePerformanceTests.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/NetworkVariablePerformanceTests.cs @@ -25,7 +25,7 @@ public class NetworkVariablePerformanceTests : BaseMultiprocessTests private class OneNetVar : NetworkBehaviour { public static int InstanceCount; - public NetworkVariableInt OneInt = new NetworkVariableInt(); + public NetworkVariable OneInt = new NetworkVariable(); public void Initialize() {