From 309021ddffcc69976cf344f1948f3195a8241ef5 Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Fri, 26 Mar 2021 13:24:14 +0000 Subject: [PATCH 1/8] add naming rules with examples --- .editorconfig | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/.editorconfig b/.editorconfig index ff40760c7a..9503bed7e2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,6 +12,9 @@ indent_style = space indent_size = 4 # formatting rules +dotnet_diagnostic.IDE0001.severity = error # Simplify name +dotnet_diagnostic.IDE0002.severity = error # Simplify member access +dotnet_diagnostic.IDE0005.severity = error # Remove unnecessary import dotnet_style_qualification_for_field = false:error dotnet_style_qualification_for_property = false:error dotnet_style_qualification_for_method = false:error @@ -24,3 +27,78 @@ csharp_prefer_braces = true:error csharp_using_directive_placement = outside_namespace:error # naming rules +# namespace MLAPI { ... } +# public class NetworkObject { ... } +# public void Spawn(...) { ... } +dotnet_naming_symbols.usertypes_naming_symbols.applicable_kinds = namespace, class, struct, enum, property, method, field, event, delegate, local_function +dotnet_naming_symbols.usertypes_naming_symbols.applicable_accessibilities = public, internal +dotnet_naming_style.usertypes_naming_style.capitalization = pascal_case +dotnet_naming_rule.usertypes_naming_rule.symbols = usertypes_naming_symbols +dotnet_naming_rule.usertypes_naming_rule.style = usertypes_naming_style +dotnet_naming_rule.usertypes_naming_rule.severity = error + +# public void ChangeOwnership(ulong newOwnerClientId) { ... } +# ulong[] targetClientIds = clientRpcParams.Send.TargetClientIds; +dotnet_naming_symbols.paramlocal_naming_symbols.applicable_kinds = parameter, local +dotnet_naming_symbols.paramlocal_naming_symbols.applicable_accessibilities = * +dotnet_naming_style.paramlocal_naming_style.capitalization = camel_case +dotnet_naming_rule.paramlocal_naming_rule.symbols = paramlocal_naming_symbols +dotnet_naming_rule.paramlocal_naming_rule.style = paramlocal_naming_style +dotnet_naming_rule.paramlocal_naming_rule.severity = error + +# interface INetworkSerializable +dotnet_naming_symbols.interface_naming_symbols.applicable_kinds = interface +dotnet_naming_symbols.interface_naming_symbols.applicable_accessibilities = public, internal +dotnet_naming_style.interface_naming_style.required_prefix = I +dotnet_naming_style.interface_naming_style.capitalization = pascal_case +dotnet_naming_rule.interface_naming_rule.symbols = interface_naming_symbols +dotnet_naming_rule.interface_naming_rule.style = interface_naming_style +dotnet_naming_rule.interface_naming_rule.severity = error + +# class NetworkVariable +dotnet_naming_symbols.typeparam_naming_symbols.applicable_kinds = type_parameter +dotnet_naming_symbols.typeparam_naming_symbols.applicable_accessibilities = public, internal +dotnet_naming_style.typeparam_naming_style.required_prefix = T +dotnet_naming_style.typeparam_naming_style.capitalization = pascal_case +dotnet_naming_rule.typeparam_naming_rule.symbols = typeparam_naming_symbols +dotnet_naming_rule.typeparam_naming_rule.style = typeparam_naming_style +dotnet_naming_rule.typeparam_naming_rule.severity = error + +# const int k_MaxCount +dotnet_naming_symbols.constant_naming_symbols.applicable_kinds = field +dotnet_naming_symbols.constant_naming_symbols.applicable_accessibilities = private, protected, protected_internal, private_protected +dotnet_naming_symbols.constant_naming_symbols.required_modifiers = const +dotnet_naming_style.constant_naming_style.required_prefix = k_ +dotnet_naming_style.constant_naming_style.capitalization = pascal_case +dotnet_naming_rule.constant_naming_rule.symbols = constant_naming_symbols +dotnet_naming_rule.constant_naming_rule.style = constant_naming_style +dotnet_naming_rule.constant_naming_rule.severity = error + +# static readonly Vector3 k_DefaultLength +dotnet_naming_symbols.staticreadonly_naming_symbols.applicable_kinds = field +dotnet_naming_symbols.staticreadonly_naming_symbols.applicable_accessibilities = private, protected, protected_internal, private_protected +dotnet_naming_symbols.staticreadonly_naming_symbols.required_modifiers = static, readonly +dotnet_naming_style.staticreadonly_naming_style.required_prefix = k_ +dotnet_naming_style.staticreadonly_naming_style.capitalization = pascal_case +dotnet_naming_rule.staticreadonly_naming_rule.symbols = staticreadonly_naming_symbols +dotnet_naming_rule.staticreadonly_naming_rule.style = staticreadonly_naming_style +dotnet_naming_rule.staticreadonly_naming_rule.severity = error + +# static int s_SharedCount +dotnet_naming_symbols.staticfield_naming_symbols.applicable_kinds = field +dotnet_naming_symbols.staticfield_naming_symbols.applicable_accessibilities = private, protected, protected_internal, private_protected +dotnet_naming_symbols.staticfield_naming_symbols.required_modifiers = static +dotnet_naming_style.staticfield_naming_style.required_prefix = s_ +dotnet_naming_style.staticfield_naming_style.capitalization = pascal_case +dotnet_naming_rule.staticfield_naming_rule.symbols = staticfield_naming_symbols +dotnet_naming_rule.staticfield_naming_rule.style = staticfield_naming_style +dotnet_naming_rule.staticfield_naming_rule.severity = error + +# int m_CurrentCount +dotnet_naming_symbols.memberfield_naming_symbols.applicable_kinds = field +dotnet_naming_symbols.memberfield_naming_symbols.applicable_accessibilities = private, protected, protected_internal, private_protected +dotnet_naming_style.memberfield_naming_style.required_prefix = m_ +dotnet_naming_style.memberfield_naming_style.capitalization = pascal_case +dotnet_naming_rule.memberfield_naming_rule.symbols = memberfield_naming_symbols +dotnet_naming_rule.memberfield_naming_rule.style = memberfield_naming_style +dotnet_naming_rule.memberfield_naming_rule.severity = error \ No newline at end of file From 61572585822139f3eac84770fd56f0c01dce0ca5 Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Fri, 26 Mar 2021 13:24:32 +0000 Subject: [PATCH 2/8] execute dotnet-format over testproject --- .../Editor/CodeGen/CodeGenHelpers.cs | 8 +- .../Editor/CodeGen/NetworkBehaviourILPP.cs | 602 +++++++++--------- .../Editor/MLAPIProfilerModule.cs | 5 - .../Editor/NetworkManagerEditor.cs | 1 - .../Runtime/Core/NetworkBehaviour.cs | 34 +- .../Runtime/Core/NetworkManager.cs | 10 +- .../Runtime/Core/NetworkObject.cs | 24 +- .../Runtime/Messaging/RpcBatcher.cs | 24 +- .../Runtime/Messaging/RpcParams.cs | 2 + .../Messaging/RpcQueue/RpcQueueContainer.cs | 72 +-- .../RpcQueue/RpcQueueHistoryFrame.cs | 12 +- .../Messaging/RpcQueue/RpcQueueProcessor.cs | 36 +- .../Profiling/PerformanceDataManager.cs | 1 - .../Runtime/Profiling/PerformanceTickData.cs | 1 - .../Profiling/ProfilerCounterUtility.cs | 2 - .../Runtime/Profiling/ProfilerCounterValue.cs | 3 - .../Runtime/Profiling/ProfilerCountersInfo.cs | 1 - .../Runtime/Profiling/ProfilerNotifier.cs | 2 + .../Runtime/Profiling/ProfilerStat.cs | 42 +- .../SceneManagement/NetworkSceneManager.cs | 10 +- .../Runtime/Serialization/NetworkReader.cs | 23 +- .../Runtime/Serialization/NetworkWriter.cs | 45 +- .../Pooled/PooledNetworkBuffer.cs | 8 +- .../Runtime/Spawning/NetworkSpawnManager.cs | 26 +- .../Runtime/Transports/NetworkTransport.cs | 2 + .../Transports/Tests/Editor/TransportTest.cs | 4 +- .../Runtime/Transports/UNET/RelayTransport.cs | 18 +- .../Tests/Editor/ProfilerTests.cs | 7 +- .../Runtime/BufferDataValidationComponent.cs | 3 +- .../Tests/Runtime/NetworkManagerHelper.cs | 60 +- .../Tests/Runtime/NetworkUpdateLoopTests.cs | 2 +- testproject/Assets/Scenes/SampleScene.unity | 47 +- testproject/Assets/Scripts/Raygun.cs | 4 +- testproject/Assets/Scripts/UIController.cs | 12 +- .../Assets/Scripts/UnityChanSpawner.cs | 4 +- 35 files changed, 573 insertions(+), 584 deletions(-) diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs index 9074380fc4..dfb51470c9 100644 --- a/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs +++ b/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs @@ -51,7 +51,7 @@ public static uint Hash(this MethodDefinition methodDefinition) } } - public static bool IsSubclassOf(this TypeDefinition typeDefinition, string ClassTypeFullName) + public static bool IsSubclassOf(this TypeDefinition typeDefinition, string classTypeFullName) { if (!typeDefinition.IsClass) { @@ -61,7 +61,7 @@ public static bool IsSubclassOf(this TypeDefinition typeDefinition, string Class var baseTypeRef = typeDefinition.BaseType; while (baseTypeRef != null) { - if (baseTypeRef.FullName == ClassTypeFullName) + if (baseTypeRef.FullName == classTypeFullName) { return true; } @@ -79,7 +79,7 @@ public static bool IsSubclassOf(this TypeDefinition typeDefinition, string Class return false; } - public static bool HasInterface(this TypeReference typeReference, string InterfaceTypeFullName) + public static bool HasInterface(this TypeReference typeReference, string interfaceTypeFullName) { if (typeReference.IsArray) { @@ -90,7 +90,7 @@ public static bool HasInterface(this TypeReference typeReference, string Interfa { var typeDef = typeReference.Resolve(); var typeFaces = typeDef.Interfaces; - return typeFaces.Any(iface => iface.InterfaceType.FullName == InterfaceTypeFullName); + return typeFaces.Any(iface => iface.InterfaceType.FullName == interfaceTypeFullName); } catch { diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs index 5f27f4d5d5..70cc919db8 100644 --- a/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs +++ b/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs @@ -85,75 +85,75 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly) return new ILPostProcessResult(new InMemoryAssembly(pe.ToArray(), pdb.ToArray()), m_Diagnostics); } - private MethodReference Debug_LogWarning_MethodRef; - private TypeReference NetworkManager_TypeRef; - private MethodReference NetworkManager_getLocalClientId_MethodRef; - private MethodReference NetworkManager_getIsListening_MethodRef; - private MethodReference NetworkManager_getIsHost_MethodRef; - private MethodReference NetworkManager_getIsServer_MethodRef; - private MethodReference NetworkManager_getIsClient_MethodRef; - private FieldReference NetworkManager_LogLevel_FieldRef; - private FieldReference NetworkManager_ntable_FieldRef; - private MethodReference NetworkManager_ntable_Add_MethodRef; - private TypeReference NetworkBehaviour_TypeRef; - private MethodReference NetworkBehaviour_BeginSendServerRpc_MethodRef; - private MethodReference NetworkBehaviour_EndSendServerRpc_MethodRef; - private MethodReference NetworkBehaviour_BeginSendClientRpc_MethodRef; - private MethodReference NetworkBehaviour_EndSendClientRpc_MethodRef; - private FieldReference NetworkBehaviour_nexec_FieldRef; - private MethodReference NetworkBehaviour_getNetworkManager_MethodRef; - private MethodReference NetworkBehaviour_getOwnerClientId_MethodRef; - private MethodReference NetworkHandlerDelegateCtor_MethodRef; - private TypeReference RpcParams_TypeRef; - private FieldReference RpcParams_Server_FieldRef; - private FieldReference RpcParams_Client_FieldRef; - private TypeReference ServerRpcParams_TypeRef; - private FieldReference ServerRpcParams_Receive_FieldRef; - private FieldReference ServerRpcParams_Receive_SenderClientId_FieldRef; - private TypeReference ClientRpcParams_TypeRef; - private TypeReference NetworkSerializer_TypeRef; - private MethodReference NetworkSerializer_SerializeBool_MethodRef; - private MethodReference NetworkSerializer_SerializeChar_MethodRef; - private MethodReference NetworkSerializer_SerializeSbyte_MethodRef; - private MethodReference NetworkSerializer_SerializeByte_MethodRef; - private MethodReference NetworkSerializer_SerializeShort_MethodRef; - private MethodReference NetworkSerializer_SerializeUshort_MethodRef; - private MethodReference NetworkSerializer_SerializeInt_MethodRef; - private MethodReference NetworkSerializer_SerializeUint_MethodRef; - private MethodReference NetworkSerializer_SerializeLong_MethodRef; - private MethodReference NetworkSerializer_SerializeUlong_MethodRef; - private MethodReference NetworkSerializer_SerializeFloat_MethodRef; - private MethodReference NetworkSerializer_SerializeDouble_MethodRef; - private MethodReference NetworkSerializer_SerializeString_MethodRef; - private MethodReference NetworkSerializer_SerializeColor_MethodRef; - private MethodReference NetworkSerializer_SerializeColor32_MethodRef; - private MethodReference NetworkSerializer_SerializeVector2_MethodRef; - private MethodReference NetworkSerializer_SerializeVector3_MethodRef; - private MethodReference NetworkSerializer_SerializeVector4_MethodRef; - private MethodReference NetworkSerializer_SerializeQuaternion_MethodRef; - private MethodReference NetworkSerializer_SerializeRay_MethodRef; - private MethodReference NetworkSerializer_SerializeRay2D_MethodRef; - private MethodReference NetworkSerializer_SerializeBoolArray_MethodRef; - private MethodReference NetworkSerializer_SerializeCharArray_MethodRef; - private MethodReference NetworkSerializer_SerializeSbyteArray_MethodRef; - private MethodReference NetworkSerializer_SerializeByteArray_MethodRef; - private MethodReference NetworkSerializer_SerializeShortArray_MethodRef; - private MethodReference NetworkSerializer_SerializeUshortArray_MethodRef; - private MethodReference NetworkSerializer_SerializeIntArray_MethodRef; - private MethodReference NetworkSerializer_SerializeUintArray_MethodRef; - private MethodReference NetworkSerializer_SerializeLongArray_MethodRef; - private MethodReference NetworkSerializer_SerializeUlongArray_MethodRef; - private MethodReference NetworkSerializer_SerializeFloatArray_MethodRef; - private MethodReference NetworkSerializer_SerializeDoubleArray_MethodRef; - private MethodReference NetworkSerializer_SerializeStringArray_MethodRef; - private MethodReference NetworkSerializer_SerializeColorArray_MethodRef; - private MethodReference NetworkSerializer_SerializeColor32Array_MethodRef; - private MethodReference NetworkSerializer_SerializeVector2Array_MethodRef; - private MethodReference NetworkSerializer_SerializeVector3Array_MethodRef; - private MethodReference NetworkSerializer_SerializeVector4Array_MethodRef; - private MethodReference NetworkSerializer_SerializeQuaternionArray_MethodRef; - private MethodReference NetworkSerializer_SerializeRayArray_MethodRef; - private MethodReference NetworkSerializer_SerializeRay2DArray_MethodRef; + private MethodReference m_Debug_LogWarning_MethodRef; + private TypeReference m_NetworkManager_TypeRef; + private MethodReference m_NetworkManager_getLocalClientId_MethodRef; + private MethodReference m_NetworkManager_getIsListening_MethodRef; + private MethodReference m_NetworkManager_getIsHost_MethodRef; + private MethodReference m_NetworkManager_getIsServer_MethodRef; + private MethodReference m_NetworkManager_getIsClient_MethodRef; + private FieldReference m_NetworkManager_LogLevel_FieldRef; + private FieldReference m_NetworkManager_ntable_FieldRef; + private MethodReference m_NetworkManager_ntable_Add_MethodRef; + private TypeReference m_NetworkBehaviour_TypeRef; + private MethodReference m_NetworkBehaviour_BeginSendServerRpc_MethodRef; + private MethodReference m_NetworkBehaviour_EndSendServerRpc_MethodRef; + private MethodReference m_NetworkBehaviour_BeginSendClientRpc_MethodRef; + private MethodReference m_NetworkBehaviour_EndSendClientRpc_MethodRef; + private FieldReference m_NetworkBehaviour_nexec_FieldRef; + private MethodReference m_NetworkBehaviour_getNetworkManager_MethodRef; + private MethodReference m_NetworkBehaviour_getOwnerClientId_MethodRef; + private MethodReference m_NetworkHandlerDelegateCtor_MethodRef; + private TypeReference m_RpcParams_TypeRef; + private FieldReference m_RpcParams_Server_FieldRef; + private FieldReference m_RpcParams_Client_FieldRef; + private TypeReference m_ServerRpcParams_TypeRef; + private FieldReference m_ServerRpcParams_Receive_FieldRef; + private FieldReference m_ServerRpcParams_Receive_SenderClientId_FieldRef; + private TypeReference m_ClientRpcParams_TypeRef; + private TypeReference m_NetworkSerializer_TypeRef; + private MethodReference m_NetworkSerializer_SerializeBool_MethodRef; + private MethodReference m_NetworkSerializer_SerializeChar_MethodRef; + private MethodReference m_NetworkSerializer_SerializeSbyte_MethodRef; + private MethodReference m_NetworkSerializer_SerializeByte_MethodRef; + private MethodReference m_NetworkSerializer_SerializeShort_MethodRef; + private MethodReference m_NetworkSerializer_SerializeUshort_MethodRef; + private MethodReference m_NetworkSerializer_SerializeInt_MethodRef; + private MethodReference m_NetworkSerializer_SerializeUint_MethodRef; + private MethodReference m_NetworkSerializer_SerializeLong_MethodRef; + private MethodReference m_NetworkSerializer_SerializeUlong_MethodRef; + private MethodReference m_NetworkSerializer_SerializeFloat_MethodRef; + private MethodReference m_NetworkSerializer_SerializeDouble_MethodRef; + private MethodReference m_NetworkSerializer_SerializeString_MethodRef; + private MethodReference m_NetworkSerializer_SerializeColor_MethodRef; + private MethodReference m_NetworkSerializer_SerializeColor32_MethodRef; + private MethodReference m_NetworkSerializer_SerializeVector2_MethodRef; + private MethodReference m_NetworkSerializer_SerializeVector3_MethodRef; + private MethodReference m_NetworkSerializer_SerializeVector4_MethodRef; + private MethodReference m_NetworkSerializer_SerializeQuaternion_MethodRef; + private MethodReference m_NetworkSerializer_SerializeRay_MethodRef; + private MethodReference m_NetworkSerializer_SerializeRay2D_MethodRef; + private MethodReference m_NetworkSerializer_SerializeBoolArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeCharArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeSbyteArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeByteArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeShortArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeUshortArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeIntArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeUintArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeLongArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeUlongArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeFloatArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeDoubleArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeStringArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeColorArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeColor32Array_MethodRef; + private MethodReference m_NetworkSerializer_SerializeVector2Array_MethodRef; + private MethodReference m_NetworkSerializer_SerializeVector3Array_MethodRef; + private MethodReference m_NetworkSerializer_SerializeVector4Array_MethodRef; + private MethodReference m_NetworkSerializer_SerializeQuaternionArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeRayArray_MethodRef; + private MethodReference m_NetworkSerializer_SerializeRay2DArray_MethodRef; private const string k_Debug_LogWarning = nameof(Debug.LogWarning); private const string k_NetworkManager_LocalClientId = nameof(NetworkManager.LocalClientId); @@ -193,7 +193,7 @@ private bool ImportReferences(ModuleDefinition moduleDefinition) case k_Debug_LogWarning: if (methodInfo.GetParameters().Length == 1) { - Debug_LogWarning_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_Debug_LogWarning_MethodRef = moduleDefinition.ImportReference(methodInfo); } break; @@ -201,25 +201,25 @@ private bool ImportReferences(ModuleDefinition moduleDefinition) } var networkManagerType = typeof(NetworkManager); - NetworkManager_TypeRef = moduleDefinition.ImportReference(networkManagerType); + m_NetworkManager_TypeRef = moduleDefinition.ImportReference(networkManagerType); foreach (var propertyInfo in networkManagerType.GetProperties()) { switch (propertyInfo.Name) { case k_NetworkManager_LocalClientId: - NetworkManager_getLocalClientId_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); + m_NetworkManager_getLocalClientId_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); break; case k_NetworkManager_IsListening: - NetworkManager_getIsListening_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); + m_NetworkManager_getIsListening_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); break; case k_NetworkManager_IsHost: - NetworkManager_getIsHost_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); + m_NetworkManager_getIsHost_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); break; case k_NetworkManager_IsServer: - NetworkManager_getIsServer_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); + m_NetworkManager_getIsServer_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); break; case k_NetworkManager_IsClient: - NetworkManager_getIsClient_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); + m_NetworkManager_getIsClient_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); break; } } @@ -229,26 +229,26 @@ private bool ImportReferences(ModuleDefinition moduleDefinition) switch (fieldInfo.Name) { case k_NetworkManager_LogLevel: - NetworkManager_LogLevel_FieldRef = moduleDefinition.ImportReference(fieldInfo); + m_NetworkManager_LogLevel_FieldRef = moduleDefinition.ImportReference(fieldInfo); break; case k_NetworkManager_ntable: - NetworkManager_ntable_FieldRef = moduleDefinition.ImportReference(fieldInfo); - NetworkManager_ntable_Add_MethodRef = moduleDefinition.ImportReference(fieldInfo.FieldType.GetMethod("Add")); + m_NetworkManager_ntable_FieldRef = moduleDefinition.ImportReference(fieldInfo); + m_NetworkManager_ntable_Add_MethodRef = moduleDefinition.ImportReference(fieldInfo.FieldType.GetMethod("Add")); break; } } var networkBehaviourType = typeof(NetworkBehaviour); - NetworkBehaviour_TypeRef = moduleDefinition.ImportReference(networkBehaviourType); + m_NetworkBehaviour_TypeRef = moduleDefinition.ImportReference(networkBehaviourType); foreach (var propertyInfo in networkBehaviourType.GetProperties()) { switch (propertyInfo.Name) { case k_NetworkBehaviour_NetworkManager: - NetworkBehaviour_getNetworkManager_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); + m_NetworkBehaviour_getNetworkManager_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); break; case k_NetworkBehaviour_OwnerClientId: - NetworkBehaviour_getOwnerClientId_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); + m_NetworkBehaviour_getOwnerClientId_MethodRef = moduleDefinition.ImportReference(propertyInfo.GetMethod); break; } } @@ -258,16 +258,16 @@ private bool ImportReferences(ModuleDefinition moduleDefinition) switch (methodInfo.Name) { case k_NetworkBehaviour_BeginSendServerRpc: - NetworkBehaviour_BeginSendServerRpc_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkBehaviour_BeginSendServerRpc_MethodRef = moduleDefinition.ImportReference(methodInfo); break; case k_NetworkBehaviour_EndSendServerRpc: - NetworkBehaviour_EndSendServerRpc_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkBehaviour_EndSendServerRpc_MethodRef = moduleDefinition.ImportReference(methodInfo); break; case k_NetworkBehaviour_BeginSendClientRpc: - NetworkBehaviour_BeginSendClientRpc_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkBehaviour_BeginSendClientRpc_MethodRef = moduleDefinition.ImportReference(methodInfo); break; case k_NetworkBehaviour_EndSendClientRpc: - NetworkBehaviour_EndSendClientRpc_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkBehaviour_EndSendClientRpc_MethodRef = moduleDefinition.ImportReference(methodInfo); break; } } @@ -277,33 +277,33 @@ private bool ImportReferences(ModuleDefinition moduleDefinition) switch (fieldInfo.Name) { case k_NetworkBehaviour_nexec: - NetworkBehaviour_nexec_FieldRef = moduleDefinition.ImportReference(fieldInfo); + m_NetworkBehaviour_nexec_FieldRef = moduleDefinition.ImportReference(fieldInfo); break; } } #pragma warning disable 618 var networkHandlerDelegateType = typeof(Action); - NetworkHandlerDelegateCtor_MethodRef = moduleDefinition.ImportReference(networkHandlerDelegateType.GetConstructor(new[] { typeof(object), typeof(IntPtr) })); + m_NetworkHandlerDelegateCtor_MethodRef = moduleDefinition.ImportReference(networkHandlerDelegateType.GetConstructor(new[] { typeof(object), typeof(IntPtr) })); var rpcParamsType = typeof(__RpcParams); - RpcParams_TypeRef = moduleDefinition.ImportReference(rpcParamsType); + m_RpcParams_TypeRef = moduleDefinition.ImportReference(rpcParamsType); foreach (var fieldInfo in rpcParamsType.GetFields()) { switch (fieldInfo.Name) { case k_RpcParams_Server: - RpcParams_Server_FieldRef = moduleDefinition.ImportReference(fieldInfo); + m_RpcParams_Server_FieldRef = moduleDefinition.ImportReference(fieldInfo); break; case k_RpcParams_Client: - RpcParams_Client_FieldRef = moduleDefinition.ImportReference(fieldInfo); + m_RpcParams_Client_FieldRef = moduleDefinition.ImportReference(fieldInfo); break; } } #pragma warning restore 618 var serverRpcParamsType = typeof(ServerRpcParams); - ServerRpcParams_TypeRef = moduleDefinition.ImportReference(serverRpcParamsType); + m_ServerRpcParams_TypeRef = moduleDefinition.ImportReference(serverRpcParamsType); foreach (var fieldInfo in serverRpcParamsType.GetFields()) { switch (fieldInfo.Name) @@ -314,21 +314,21 @@ private bool ImportReferences(ModuleDefinition moduleDefinition) switch (recvFieldInfo.Name) { case k_ServerRpcReceiveParams_SenderClientId: - ServerRpcParams_Receive_SenderClientId_FieldRef = moduleDefinition.ImportReference(recvFieldInfo); + m_ServerRpcParams_Receive_SenderClientId_FieldRef = moduleDefinition.ImportReference(recvFieldInfo); break; } } - ServerRpcParams_Receive_FieldRef = moduleDefinition.ImportReference(fieldInfo); + m_ServerRpcParams_Receive_FieldRef = moduleDefinition.ImportReference(fieldInfo); break; } } var clientRpcParamsType = typeof(ClientRpcParams); - ClientRpcParams_TypeRef = moduleDefinition.ImportReference(clientRpcParamsType); + m_ClientRpcParams_TypeRef = moduleDefinition.ImportReference(clientRpcParamsType); var networkSerializerType = typeof(NetworkSerializer); - NetworkSerializer_TypeRef = moduleDefinition.ImportReference(networkSerializerType); + m_NetworkSerializer_TypeRef = moduleDefinition.ImportReference(networkSerializerType); foreach (var methodInfo in networkSerializerType.GetMethods()) { if (methodInfo.Name != nameof(NetworkSerializer.Serialize)) @@ -352,171 +352,171 @@ private bool ImportReferences(ModuleDefinition moduleDefinition) if (paramTypeName == typeof(bool).MakeByRefType().Name) { - NetworkSerializer_SerializeBool_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeBool_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(char).MakeByRefType().Name) { - NetworkSerializer_SerializeChar_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeChar_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(sbyte).MakeByRefType().Name) { - NetworkSerializer_SerializeSbyte_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeSbyte_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(byte).MakeByRefType().Name) { - NetworkSerializer_SerializeByte_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeByte_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(short).MakeByRefType().Name) { - NetworkSerializer_SerializeShort_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeShort_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(ushort).MakeByRefType().Name) { - NetworkSerializer_SerializeUshort_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeUshort_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(int).MakeByRefType().Name) { - NetworkSerializer_SerializeInt_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeInt_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(uint).MakeByRefType().Name) { - NetworkSerializer_SerializeUint_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeUint_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(long).MakeByRefType().Name) { - NetworkSerializer_SerializeLong_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeLong_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(ulong).MakeByRefType().Name) { - NetworkSerializer_SerializeUlong_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeUlong_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(float).MakeByRefType().Name) { - NetworkSerializer_SerializeFloat_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeFloat_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(double).MakeByRefType().Name) { - NetworkSerializer_SerializeDouble_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeDouble_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(string).MakeByRefType().Name) { - NetworkSerializer_SerializeString_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeString_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Color).MakeByRefType().Name) { - NetworkSerializer_SerializeColor_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeColor_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Color32).MakeByRefType().Name) { - NetworkSerializer_SerializeColor32_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeColor32_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Vector2).MakeByRefType().Name) { - NetworkSerializer_SerializeVector2_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeVector2_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Vector3).MakeByRefType().Name) { - NetworkSerializer_SerializeVector3_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeVector3_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Vector4).MakeByRefType().Name) { - NetworkSerializer_SerializeVector4_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeVector4_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Quaternion).MakeByRefType().Name) { - NetworkSerializer_SerializeQuaternion_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeQuaternion_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Ray).MakeByRefType().Name) { - NetworkSerializer_SerializeRay_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeRay_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Ray2D).MakeByRefType().Name) { - NetworkSerializer_SerializeRay2D_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeRay2D_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(bool[]).MakeByRefType().Name) { - NetworkSerializer_SerializeBoolArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeBoolArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(char[]).MakeByRefType().Name) { - NetworkSerializer_SerializeCharArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeCharArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(sbyte[]).MakeByRefType().Name) { - NetworkSerializer_SerializeSbyteArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeSbyteArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(byte[]).MakeByRefType().Name) { - NetworkSerializer_SerializeByteArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeByteArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(short[]).MakeByRefType().Name) { - NetworkSerializer_SerializeShortArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeShortArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(ushort[]).MakeByRefType().Name) { - NetworkSerializer_SerializeUshortArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeUshortArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(int[]).MakeByRefType().Name) { - NetworkSerializer_SerializeIntArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeIntArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(uint[]).MakeByRefType().Name) { - NetworkSerializer_SerializeUintArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeUintArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(long[]).MakeByRefType().Name) { - NetworkSerializer_SerializeLongArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeLongArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(ulong[]).MakeByRefType().Name) { - NetworkSerializer_SerializeUlongArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeUlongArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(float[]).MakeByRefType().Name) { - NetworkSerializer_SerializeFloatArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeFloatArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(double[]).MakeByRefType().Name) { - NetworkSerializer_SerializeDoubleArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeDoubleArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(string[]).MakeByRefType().Name) { - NetworkSerializer_SerializeStringArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeStringArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Color[]).MakeByRefType().Name) { - NetworkSerializer_SerializeColorArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeColorArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Color32[]).MakeByRefType().Name) { - NetworkSerializer_SerializeColor32Array_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeColor32Array_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Vector2[]).MakeByRefType().Name) { - NetworkSerializer_SerializeVector2Array_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeVector2Array_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Vector3[]).MakeByRefType().Name) { - NetworkSerializer_SerializeVector3Array_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeVector3Array_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Vector4[]).MakeByRefType().Name) { - NetworkSerializer_SerializeVector4Array_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeVector4Array_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Quaternion[]).MakeByRefType().Name) { - NetworkSerializer_SerializeQuaternionArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeQuaternionArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Ray[]).MakeByRefType().Name) { - NetworkSerializer_SerializeRayArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeRayArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } else if (paramTypeName == typeof(Ray2D[]).MakeByRefType().Name) { - NetworkSerializer_SerializeRay2DArray_MethodRef = moduleDefinition.ImportReference(methodInfo); + m_NetworkSerializer_SerializeRay2DArray_MethodRef = moduleDefinition.ImportReference(methodInfo); } } @@ -572,12 +572,12 @@ private void ProcessNetworkBehaviour(TypeDefinition typeDefinition) typeDefinition.Methods.Add(method); // NetworkManager.__ntable.Add(HandlerHash, HandlerMethod); - instructions.Add(processor.Create(OpCodes.Ldsfld, NetworkManager_ntable_FieldRef)); + instructions.Add(processor.Create(OpCodes.Ldsfld, m_NetworkManager_ntable_FieldRef)); instructions.Add(processor.Create(OpCodes.Ldc_I4, unchecked((int)hash))); instructions.Add(processor.Create(OpCodes.Ldnull)); instructions.Add(processor.Create(OpCodes.Ldftn, method)); - instructions.Add(processor.Create(OpCodes.Newobj, NetworkHandlerDelegateCtor_MethodRef)); - instructions.Add(processor.Create(OpCodes.Call, NetworkManager_ntable_Add_MethodRef)); + instructions.Add(processor.Create(OpCodes.Newobj, m_NetworkHandlerDelegateCtor_MethodRef)); + instructions.Add(processor.Create(OpCodes.Call, m_NetworkManager_ntable_Add_MethodRef)); } instructions.Reverse(); @@ -716,10 +716,10 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA methodDefinition.Body.InitLocals = true; // NetworkManager networkManager; - methodDefinition.Body.Variables.Add(new VariableDefinition(NetworkManager_TypeRef)); + methodDefinition.Body.Variables.Add(new VariableDefinition(m_NetworkManager_TypeRef)); int netManLocIdx = methodDefinition.Body.Variables.Count - 1; // NetworkSerializer serializer; - methodDefinition.Body.Variables.Add(new VariableDefinition(NetworkSerializer_TypeRef)); + methodDefinition.Body.Variables.Add(new VariableDefinition(m_NetworkSerializer_TypeRef)); int serializerLocIdx = methodDefinition.Body.Variables.Count - 1; // uint methodHash; methodDefinition.Body.Variables.Add(new VariableDefinition(typeSystem.UInt32)); @@ -727,7 +727,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA // XXXRpcParams if (!hasRpcParams) { - methodDefinition.Body.Variables.Add(new VariableDefinition(isServerRpc ? ServerRpcParams_TypeRef : ClientRpcParams_TypeRef)); + methodDefinition.Body.Variables.Add(new VariableDefinition(isServerRpc ? m_ServerRpcParams_TypeRef : m_ClientRpcParams_TypeRef)); } int rpcParamsIdx = !hasRpcParams ? methodDefinition.Body.Variables.Count - 1 : -1; @@ -738,14 +738,14 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA // networkManager = this.NetworkManager; instructions.Add(processor.Create(OpCodes.Ldarg_0)); - instructions.Add(processor.Create(OpCodes.Call, NetworkBehaviour_getNetworkManager_MethodRef)); + instructions.Add(processor.Create(OpCodes.Call, m_NetworkBehaviour_getNetworkManager_MethodRef)); instructions.Add(processor.Create(OpCodes.Stloc, netManLocIdx)); // if (networkManager == null || !networkManager.IsListening) return; instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx)); instructions.Add(processor.Create(OpCodes.Brfalse, returnInstr)); instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkManager_getIsListening_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkManager_getIsListening_MethodRef)); instructions.Add(processor.Create(OpCodes.Brtrue, lastInstr)); instructions.Add(returnInstr); @@ -760,7 +760,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA // if (__nexec != NExec.Server) -> ServerRpc // if (__nexec != NExec.Client) -> ClientRpc instructions.Add(processor.Create(OpCodes.Ldarg_0)); - instructions.Add(processor.Create(OpCodes.Ldfld, NetworkBehaviour_nexec_FieldRef)); + instructions.Add(processor.Create(OpCodes.Ldfld, m_NetworkBehaviour_nexec_FieldRef)); #pragma warning disable 618 instructions.Add(processor.Create(OpCodes.Ldc_I4, (int)(isServerRpc ? NetworkBehaviour.__NExec.Server : NetworkBehaviour.__NExec.Client))); #pragma warning restore 618 @@ -772,10 +772,10 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA // if (networkManager.IsClient || networkManager.IsHost) { ... } -> ServerRpc // if (networkManager.IsServer || networkManager.IsHost) { ... } -> ClientRpc instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx)); - instructions.Add(processor.Create(OpCodes.Callvirt, isServerRpc ? NetworkManager_getIsClient_MethodRef : NetworkManager_getIsServer_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, isServerRpc ? m_NetworkManager_getIsClient_MethodRef : m_NetworkManager_getIsServer_MethodRef)); instructions.Add(processor.Create(OpCodes.Brtrue, beginInstr)); instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkManager_getIsHost_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkManager_getIsHost_MethodRef)); instructions.Add(processor.Create(OpCodes.Brfalse, lastInstr)); instructions.Add(beginInstr); @@ -793,9 +793,9 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA // if (this.OwnerClientId != networkManager.LocalClientId) { ... } return; instructions.Add(processor.Create(OpCodes.Ldarg_0)); - instructions.Add(processor.Create(OpCodes.Call, NetworkBehaviour_getOwnerClientId_MethodRef)); + instructions.Add(processor.Create(OpCodes.Call, m_NetworkBehaviour_getOwnerClientId_MethodRef)); instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkManager_getLocalClientId_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkManager_getLocalClientId_MethodRef)); instructions.Add(processor.Create(OpCodes.Ceq)); instructions.Add(processor.Create(OpCodes.Ldc_I4, 0)); instructions.Add(processor.Create(OpCodes.Ceq)); @@ -805,7 +805,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA // if (LogLevel.Normal > networkManager.LogLevel) instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx)); - instructions.Add(processor.Create(OpCodes.Ldfld, NetworkManager_LogLevel_FieldRef)); + instructions.Add(processor.Create(OpCodes.Ldfld, m_NetworkManager_LogLevel_FieldRef)); instructions.Add(processor.Create(OpCodes.Ldc_I4, (int)LogLevel.Normal)); instructions.Add(processor.Create(OpCodes.Cgt)); instructions.Add(processor.Create(OpCodes.Ldc_I4, 0)); @@ -814,7 +814,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA // Debug.LogWarning(...); instructions.Add(processor.Create(OpCodes.Ldstr, "Only the owner can invoke a ServerRpc that requires ownership!")); - instructions.Add(processor.Create(OpCodes.Call, Debug_LogWarning_MethodRef)); + instructions.Add(processor.Create(OpCodes.Call, m_Debug_LogWarning_MethodRef)); instructions.Add(logNextInstr); @@ -832,7 +832,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldc_I4, (int)rpcDelivery)); // BeginSendServerRpc - instructions.Add(processor.Create(OpCodes.Call, NetworkBehaviour_BeginSendServerRpc_MethodRef)); + instructions.Add(processor.Create(OpCodes.Call, m_NetworkBehaviour_BeginSendServerRpc_MethodRef)); instructions.Add(processor.Create(OpCodes.Stloc, serializerLocIdx)); } else @@ -848,7 +848,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldc_I4, (int)rpcDelivery)); // BeginSendClientRpc - instructions.Add(processor.Create(OpCodes.Call, NetworkBehaviour_BeginSendClientRpc_MethodRef)); + instructions.Add(processor.Create(OpCodes.Call, m_NetworkBehaviour_BeginSendClientRpc_MethodRef)); instructions.Add(processor.Create(OpCodes.Stloc, serializerLocIdx)); } @@ -862,7 +862,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA // serializer.Serialize(ref methodHash); // NetworkMethodId instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, methodHashLocIdx)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUint_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUint_MethodRef)); // write method parameters into stream for (int paramIndex = 0; paramIndex < paramCount; ++paramIndex) @@ -876,7 +876,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeBool_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeBool_MethodRef)); continue; } @@ -884,7 +884,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeBoolArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeBoolArray_MethodRef)); continue; } @@ -892,7 +892,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeChar_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeChar_MethodRef)); continue; } @@ -900,7 +900,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeCharArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeCharArray_MethodRef)); continue; } @@ -908,7 +908,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeSbyte_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeSbyte_MethodRef)); continue; } @@ -916,7 +916,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeSbyteArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeSbyteArray_MethodRef)); continue; } @@ -924,7 +924,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeByte_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeByte_MethodRef)); continue; } @@ -932,7 +932,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeByteArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeByteArray_MethodRef)); continue; } @@ -940,7 +940,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeShort_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeShort_MethodRef)); continue; } @@ -948,7 +948,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeShortArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeShortArray_MethodRef)); continue; } @@ -956,7 +956,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUshort_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUshort_MethodRef)); continue; } @@ -964,7 +964,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUshortArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUshortArray_MethodRef)); continue; } @@ -972,7 +972,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeInt_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeInt_MethodRef)); continue; } @@ -980,7 +980,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeIntArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeIntArray_MethodRef)); continue; } @@ -988,7 +988,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUint_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUint_MethodRef)); continue; } @@ -996,7 +996,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUintArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUintArray_MethodRef)); continue; } @@ -1004,7 +1004,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeLong_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeLong_MethodRef)); continue; } @@ -1012,7 +1012,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeLongArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeLongArray_MethodRef)); continue; } @@ -1020,7 +1020,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUlong_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUlong_MethodRef)); continue; } @@ -1028,7 +1028,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUlongArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUlongArray_MethodRef)); continue; } @@ -1036,7 +1036,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeFloat_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeFloat_MethodRef)); continue; } @@ -1044,7 +1044,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeFloatArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeFloatArray_MethodRef)); continue; } @@ -1052,7 +1052,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeDouble_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeDouble_MethodRef)); continue; } @@ -1060,7 +1060,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeDoubleArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeDoubleArray_MethodRef)); continue; } @@ -1068,7 +1068,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeString_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeString_MethodRef)); continue; } @@ -1076,7 +1076,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeStringArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeStringArray_MethodRef)); continue; } @@ -1086,7 +1086,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeColor_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeColor_MethodRef)); continue; } @@ -1094,7 +1094,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeColorArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeColorArray_MethodRef)); continue; } @@ -1102,7 +1102,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeColor32_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeColor32_MethodRef)); continue; } @@ -1110,7 +1110,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeColor32Array_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeColor32Array_MethodRef)); continue; } @@ -1118,7 +1118,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeVector2_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector2_MethodRef)); continue; } @@ -1126,7 +1126,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeVector2Array_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector2Array_MethodRef)); continue; } @@ -1134,7 +1134,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeVector3_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector3_MethodRef)); continue; } @@ -1142,7 +1142,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeVector3Array_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector3Array_MethodRef)); continue; } @@ -1150,7 +1150,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeVector4_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector4_MethodRef)); continue; } @@ -1158,7 +1158,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeVector4Array_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector4Array_MethodRef)); continue; } @@ -1166,7 +1166,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeQuaternion_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeQuaternion_MethodRef)); continue; } @@ -1174,7 +1174,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeQuaternionArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeQuaternionArray_MethodRef)); continue; } @@ -1182,7 +1182,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeRay_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeRay_MethodRef)); continue; } @@ -1190,7 +1190,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeRayArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeRayArray_MethodRef)); continue; } @@ -1198,7 +1198,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeRay2D_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeRay2D_MethodRef)); continue; } @@ -1206,7 +1206,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA { instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldarga, paramIndex + 1)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeRay2DArray_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeRay2DArray_MethodRef)); continue; } @@ -1226,7 +1226,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, localIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeInt_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeInt_MethodRef)); continue; } @@ -1240,7 +1240,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, localIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUint_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUint_MethodRef)); continue; } @@ -1254,7 +1254,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, localIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeByte_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeByte_MethodRef)); continue; } @@ -1268,7 +1268,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, localIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeSbyte_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeSbyte_MethodRef)); continue; } @@ -1282,7 +1282,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, localIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeShort_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeShort_MethodRef)); continue; } @@ -1296,7 +1296,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, localIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUshort_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUshort_MethodRef)); continue; } @@ -1310,7 +1310,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, localIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeLong_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeLong_MethodRef)); continue; } @@ -1324,7 +1324,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, localIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUlong_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUlong_MethodRef)); continue; } } @@ -1356,7 +1356,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, arrLenLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeInt_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeInt_MethodRef)); methodDefinition.Body.Variables.Add(new VariableDefinition(typeSystem.Int32)); int counterLocalIndex = methodDefinition.Body.Variables.Count - 1; @@ -1381,7 +1381,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, enumValLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeInt_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeInt_MethodRef)); } else if (paramElemEnumIntType == typeSystem.UInt32) { @@ -1395,7 +1395,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, enumValLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUint_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUint_MethodRef)); } else if (paramElemEnumIntType == typeSystem.Byte) { @@ -1409,7 +1409,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, enumValLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeByte_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeByte_MethodRef)); } else if (paramElemEnumIntType == typeSystem.SByte) { @@ -1423,7 +1423,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, enumValLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeSbyte_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeSbyte_MethodRef)); } else if (paramElemEnumIntType == typeSystem.Int16) { @@ -1437,7 +1437,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, enumValLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeShort_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeShort_MethodRef)); } else if (paramElemEnumIntType == typeSystem.UInt16) { @@ -1451,7 +1451,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, enumValLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUshort_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUshort_MethodRef)); } else if (paramElemEnumIntType == typeSystem.Int64) { @@ -1465,7 +1465,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, enumValLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeLong_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeLong_MethodRef)); } else if (paramElemEnumIntType == typeSystem.UInt64) { @@ -1479,7 +1479,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, enumValLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeUlong_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeUlong_MethodRef)); } instructions.Add(processor.Create(OpCodes.Ldloc, counterLocalIndex)); @@ -1524,7 +1524,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, isSetLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeBool_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeBool_MethodRef)); var notSetInstr = processor.Create(OpCodes.Nop); @@ -1569,7 +1569,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, arrLenLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeInt_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeInt_MethodRef)); methodDefinition.Body.Variables.Add(new VariableDefinition(typeSystem.Int32)); int counterLocalIndex = methodDefinition.Body.Variables.Count - 1; @@ -1606,7 +1606,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldloc, serializerLocIdx)); instructions.Add(processor.Create(OpCodes.Ldloca, isSetLocalIndex)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkSerializer_SerializeBool_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkSerializer_SerializeBool_MethodRef)); var notSetInstr = processor.Create(OpCodes.Nop); @@ -1665,7 +1665,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldc_I4, (int)rpcDelivery)); // EndSendServerRpc - instructions.Add(processor.Create(OpCodes.Call, NetworkBehaviour_EndSendServerRpc_MethodRef)); + instructions.Add(processor.Create(OpCodes.Call, m_NetworkBehaviour_EndSendServerRpc_MethodRef)); } else { @@ -1691,7 +1691,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA instructions.Add(processor.Create(OpCodes.Ldc_I4, (int)rpcDelivery)); // EndSendClientRpc - instructions.Add(processor.Create(OpCodes.Call, NetworkBehaviour_EndSendClientRpc_MethodRef)); + instructions.Add(processor.Create(OpCodes.Call, m_NetworkBehaviour_EndSendClientRpc_MethodRef)); } instructions.Add(lastInstr); @@ -1704,7 +1704,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA // if (__nexec == NExec.Server) -> ServerRpc // if (__nexec == NExec.Client) -> ClientRpc instructions.Add(processor.Create(OpCodes.Ldarg_0)); - instructions.Add(processor.Create(OpCodes.Ldfld, NetworkBehaviour_nexec_FieldRef)); + instructions.Add(processor.Create(OpCodes.Ldfld, m_NetworkBehaviour_nexec_FieldRef)); #pragma warning disable 618 instructions.Add(processor.Create(OpCodes.Ldc_I4, (int)(isServerRpc ? NetworkBehaviour.__NExec.Server : NetworkBehaviour.__NExec.Client))); #pragma warning restore 618 @@ -1714,10 +1714,10 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA // if (networkManager.IsServer || networkManager.IsHost) -> ServerRpc // if (networkManager.IsClient || networkManager.IsHost) -> ClientRpc instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx)); - instructions.Add(processor.Create(OpCodes.Callvirt, isServerRpc ? NetworkManager_getIsServer_MethodRef : NetworkManager_getIsClient_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, isServerRpc ? m_NetworkManager_getIsServer_MethodRef : m_NetworkManager_getIsClient_MethodRef)); instructions.Add(processor.Create(OpCodes.Brtrue, lastInstr)); instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx)); - instructions.Add(processor.Create(OpCodes.Callvirt, NetworkManager_getIsHost_MethodRef)); + instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkManager_getIsHost_MethodRef)); instructions.Add(processor.Create(OpCodes.Brtrue, lastInstr)); instructions.Add(returnInstr); @@ -1735,9 +1735,9 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition $"{methodDefinition.Name}__nhandler", MethodAttributes.Private | MethodAttributes.Static | MethodAttributes.HideBySig, methodDefinition.Module.TypeSystem.Void); - nhandler.Parameters.Add(new ParameterDefinition("target", ParameterAttributes.None, NetworkBehaviour_TypeRef)); - nhandler.Parameters.Add(new ParameterDefinition("serializer", ParameterAttributes.None, NetworkSerializer_TypeRef)); - nhandler.Parameters.Add(new ParameterDefinition("rpcParams", ParameterAttributes.None, RpcParams_TypeRef)); + nhandler.Parameters.Add(new ParameterDefinition("target", ParameterAttributes.None, m_NetworkBehaviour_TypeRef)); + nhandler.Parameters.Add(new ParameterDefinition("serializer", ParameterAttributes.None, m_NetworkSerializer_TypeRef)); + nhandler.Parameters.Add(new ParameterDefinition("rpcParams", ParameterAttributes.None, m_RpcParams_TypeRef)); var processor = nhandler.Body.GetILProcessor(); var isServerRpc = rpcAttribute.AttributeType.FullName == CodeGenHelpers.ServerRpcAttribute_FullName; @@ -1754,7 +1754,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition nhandler.Body.InitLocals = true; // NetworkManager networkManager; - nhandler.Body.Variables.Add(new VariableDefinition(NetworkManager_TypeRef)); + nhandler.Body.Variables.Add(new VariableDefinition(m_NetworkManager_TypeRef)); int netManLocIdx = nhandler.Body.Variables.Count - 1; { @@ -1763,14 +1763,14 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition // networkManager = this.NetworkManager; processor.Emit(OpCodes.Ldarg_0); - processor.Emit(OpCodes.Call, NetworkBehaviour_getNetworkManager_MethodRef); + processor.Emit(OpCodes.Call, m_NetworkBehaviour_getNetworkManager_MethodRef); processor.Emit(OpCodes.Stloc, netManLocIdx); // if (networkManager == null || !networkManager.IsListening) return; processor.Emit(OpCodes.Ldloc, netManLocIdx); processor.Emit(OpCodes.Brfalse, returnInstr); processor.Emit(OpCodes.Ldloc, netManLocIdx); - processor.Emit(OpCodes.Callvirt, NetworkManager_getIsListening_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkManager_getIsListening_MethodRef); processor.Emit(OpCodes.Brtrue, lastInstr); processor.Append(returnInstr); @@ -1784,11 +1784,11 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition // if (rpcParams.Server.Receive.SenderClientId != target.OwnerClientId) { ... } return; processor.Emit(OpCodes.Ldarg_2); - processor.Emit(OpCodes.Ldfld, RpcParams_Server_FieldRef); - processor.Emit(OpCodes.Ldfld, ServerRpcParams_Receive_FieldRef); - processor.Emit(OpCodes.Ldfld, ServerRpcParams_Receive_SenderClientId_FieldRef); + processor.Emit(OpCodes.Ldfld, m_RpcParams_Server_FieldRef); + processor.Emit(OpCodes.Ldfld, m_ServerRpcParams_Receive_FieldRef); + processor.Emit(OpCodes.Ldfld, m_ServerRpcParams_Receive_SenderClientId_FieldRef); processor.Emit(OpCodes.Ldarg_0); - processor.Emit(OpCodes.Call, NetworkBehaviour_getOwnerClientId_MethodRef); + processor.Emit(OpCodes.Call, m_NetworkBehaviour_getOwnerClientId_MethodRef); processor.Emit(OpCodes.Ceq); processor.Emit(OpCodes.Ldc_I4, 0); processor.Emit(OpCodes.Ceq); @@ -1798,7 +1798,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition // if (LogLevel.Normal > networkManager.LogLevel) processor.Emit(OpCodes.Ldloc, netManLocIdx); - processor.Emit(OpCodes.Ldfld, NetworkManager_LogLevel_FieldRef); + processor.Emit(OpCodes.Ldfld, m_NetworkManager_LogLevel_FieldRef); processor.Emit(OpCodes.Ldc_I4, (int)LogLevel.Normal); processor.Emit(OpCodes.Cgt); processor.Emit(OpCodes.Ldc_I4, 0); @@ -1807,7 +1807,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition // Debug.LogWarning(...); processor.Emit(OpCodes.Ldstr, "Only the owner can invoke a ServerRpc that requires ownership!"); - processor.Emit(OpCodes.Call, Debug_LogWarning_MethodRef); + processor.Emit(OpCodes.Call, m_Debug_LogWarning_MethodRef); processor.Append(logNextInstr); @@ -1834,7 +1834,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeBool_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeBool_MethodRef); continue; } @@ -1842,7 +1842,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeBoolArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeBoolArray_MethodRef); continue; } @@ -1850,7 +1850,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeChar_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeChar_MethodRef); continue; } @@ -1858,7 +1858,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeCharArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeCharArray_MethodRef); continue; } @@ -1866,7 +1866,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeSbyte_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeSbyte_MethodRef); continue; } @@ -1874,7 +1874,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeSbyteArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeSbyteArray_MethodRef); continue; } @@ -1882,7 +1882,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeByte_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeByte_MethodRef); continue; } @@ -1890,7 +1890,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeByteArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeByteArray_MethodRef); continue; } @@ -1898,7 +1898,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeShort_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeShort_MethodRef); continue; } @@ -1906,7 +1906,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeShortArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeShortArray_MethodRef); continue; } @@ -1914,7 +1914,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUshort_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUshort_MethodRef); continue; } @@ -1922,7 +1922,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUshortArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUshortArray_MethodRef); continue; } @@ -1930,7 +1930,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeInt_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeInt_MethodRef); continue; } @@ -1938,7 +1938,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeIntArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeIntArray_MethodRef); continue; } @@ -1946,7 +1946,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUint_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUint_MethodRef); continue; } @@ -1954,7 +1954,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUintArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUintArray_MethodRef); continue; } @@ -1962,7 +1962,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeLong_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeLong_MethodRef); continue; } @@ -1970,7 +1970,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeLongArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeLongArray_MethodRef); continue; } @@ -1978,7 +1978,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUlong_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUlong_MethodRef); continue; } @@ -1986,7 +1986,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUlongArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUlongArray_MethodRef); continue; } @@ -1994,7 +1994,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeFloat_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeFloat_MethodRef); continue; } @@ -2002,7 +2002,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeFloatArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeFloatArray_MethodRef); continue; } @@ -2010,7 +2010,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeDouble_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeDouble_MethodRef); continue; } @@ -2018,7 +2018,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeDoubleArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeDoubleArray_MethodRef); continue; } @@ -2026,7 +2026,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeString_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeString_MethodRef); continue; } @@ -2034,7 +2034,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeStringArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeStringArray_MethodRef); continue; } @@ -2044,7 +2044,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeColor_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeColor_MethodRef); continue; } @@ -2052,7 +2052,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeColorArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeColorArray_MethodRef); continue; } @@ -2060,7 +2060,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeColor32_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeColor32_MethodRef); continue; } @@ -2068,7 +2068,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeColor32Array_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeColor32Array_MethodRef); continue; } @@ -2076,7 +2076,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeVector2_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector2_MethodRef); continue; } @@ -2084,7 +2084,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeVector2Array_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector2Array_MethodRef); continue; } @@ -2092,7 +2092,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeVector3_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector3_MethodRef); continue; } @@ -2100,7 +2100,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeVector3Array_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector3Array_MethodRef); continue; } @@ -2108,7 +2108,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeVector4_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector4_MethodRef); continue; } @@ -2116,7 +2116,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeVector4Array_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeVector4Array_MethodRef); continue; } @@ -2124,7 +2124,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeQuaternion_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeQuaternion_MethodRef); continue; } @@ -2132,7 +2132,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeQuaternionArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeQuaternionArray_MethodRef); continue; } @@ -2140,7 +2140,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeRay_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeRay_MethodRef); continue; } @@ -2148,7 +2148,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeRayArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeRayArray_MethodRef); continue; } @@ -2156,7 +2156,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeRay2D_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeRay2D_MethodRef); continue; } @@ -2164,7 +2164,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition { processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, localIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeRay2DArray_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeRay2DArray_MethodRef); continue; } @@ -2181,7 +2181,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeInt_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeInt_MethodRef); processor.Emit(OpCodes.Ldloc, enumLocalIndex); processor.Emit(OpCodes.Stloc, localIndex); @@ -2195,7 +2195,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUint_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUint_MethodRef); processor.Emit(OpCodes.Ldloc, enumLocalIndex); processor.Emit(OpCodes.Stloc, localIndex); @@ -2209,7 +2209,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeByte_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeByte_MethodRef); processor.Emit(OpCodes.Ldloc, enumLocalIndex); processor.Emit(OpCodes.Stloc, localIndex); @@ -2223,7 +2223,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeSbyte_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeSbyte_MethodRef); processor.Emit(OpCodes.Ldloc, enumLocalIndex); processor.Emit(OpCodes.Stloc, localIndex); @@ -2237,7 +2237,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeShort_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeShort_MethodRef); processor.Emit(OpCodes.Ldloc, enumLocalIndex); processor.Emit(OpCodes.Stloc, localIndex); @@ -2251,7 +2251,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUshort_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUshort_MethodRef); processor.Emit(OpCodes.Ldloc, enumLocalIndex); processor.Emit(OpCodes.Stloc, localIndex); @@ -2265,7 +2265,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeLong_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeLong_MethodRef); processor.Emit(OpCodes.Ldloc, enumLocalIndex); processor.Emit(OpCodes.Stloc, localIndex); @@ -2279,7 +2279,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUlong_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUlong_MethodRef); processor.Emit(OpCodes.Ldloc, enumLocalIndex); processor.Emit(OpCodes.Stloc, localIndex); @@ -2300,7 +2300,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, arrLenLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeInt_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeInt_MethodRef); var postForInstr = processor.Create(OpCodes.Nop); @@ -2331,7 +2331,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumValLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeInt_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeInt_MethodRef); processor.Emit(OpCodes.Ldloc, localIndex); processor.Emit(OpCodes.Ldloc, counterLocalIndex); @@ -2345,7 +2345,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumValLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUint_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUint_MethodRef); processor.Emit(OpCodes.Ldloc, localIndex); processor.Emit(OpCodes.Ldloc, counterLocalIndex); @@ -2359,7 +2359,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumValLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeByte_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeByte_MethodRef); processor.Emit(OpCodes.Ldloc, localIndex); processor.Emit(OpCodes.Ldloc, counterLocalIndex); @@ -2373,7 +2373,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumValLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeSbyte_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeSbyte_MethodRef); processor.Emit(OpCodes.Ldloc, localIndex); processor.Emit(OpCodes.Ldloc, counterLocalIndex); @@ -2387,7 +2387,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumValLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeShort_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeShort_MethodRef); processor.Emit(OpCodes.Ldloc, localIndex); processor.Emit(OpCodes.Ldloc, counterLocalIndex); @@ -2401,7 +2401,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumValLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUshort_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUshort_MethodRef); processor.Emit(OpCodes.Ldloc, localIndex); processor.Emit(OpCodes.Ldloc, counterLocalIndex); @@ -2415,7 +2415,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumValLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeLong_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeLong_MethodRef); processor.Emit(OpCodes.Ldloc, localIndex); processor.Emit(OpCodes.Ldloc, counterLocalIndex); @@ -2429,7 +2429,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, enumValLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeUlong_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeUlong_MethodRef); processor.Emit(OpCodes.Ldloc, localIndex); processor.Emit(OpCodes.Ldloc, counterLocalIndex); @@ -2478,7 +2478,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, isSetLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeBool_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeBool_MethodRef); var notSetInstr = processor.Create(OpCodes.Nop); @@ -2515,7 +2515,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, arrLenLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeInt_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeInt_MethodRef); var postForInstr = processor.Create(OpCodes.Nop); @@ -2559,7 +2559,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition processor.Emit(OpCodes.Ldarg_1); processor.Emit(OpCodes.Ldloca, isSetLocalIndex); - processor.Emit(OpCodes.Callvirt, NetworkSerializer_SerializeBool_MethodRef); + processor.Emit(OpCodes.Callvirt, m_NetworkSerializer_SerializeBool_MethodRef); var notSetInstr = processor.Create(OpCodes.Nop); @@ -2602,7 +2602,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition if (paramType.FullName == CodeGenHelpers.ServerRpcParams_FullName) { processor.Emit(OpCodes.Ldarg_2); - processor.Emit(OpCodes.Ldfld, RpcParams_Server_FieldRef); + processor.Emit(OpCodes.Ldfld, m_RpcParams_Server_FieldRef); processor.Emit(OpCodes.Stloc, localIndex); continue; } @@ -2611,7 +2611,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition if (paramType.FullName == CodeGenHelpers.ClientRpcParams_FullName) { processor.Emit(OpCodes.Ldarg_2); - processor.Emit(OpCodes.Ldfld, RpcParams_Client_FieldRef); + processor.Emit(OpCodes.Ldfld, m_RpcParams_Client_FieldRef); processor.Emit(OpCodes.Stloc, localIndex); continue; } @@ -2624,7 +2624,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition #pragma warning disable 618 processor.Emit(OpCodes.Ldc_I4, (int)(isServerRpc ? NetworkBehaviour.__NExec.Server : NetworkBehaviour.__NExec.Client)); #pragma warning restore 618 - processor.Emit(OpCodes.Stfld, NetworkBehaviour_nexec_FieldRef); + processor.Emit(OpCodes.Stfld, m_NetworkBehaviour_nexec_FieldRef); // NetworkBehaviour.XXXRpc(...); processor.Emit(OpCodes.Ldarg_0); @@ -2637,7 +2637,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition #pragma warning disable 618 processor.Emit(OpCodes.Ldc_I4, (int)NetworkBehaviour.__NExec.None); #pragma warning restore 618 - processor.Emit(OpCodes.Stfld, NetworkBehaviour_nexec_FieldRef); + processor.Emit(OpCodes.Stfld, m_NetworkBehaviour_nexec_FieldRef); processor.Emit(OpCodes.Ret); return nhandler; diff --git a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs index a95d42f4a5..c58744ea8c 100644 --- a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs +++ b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using MLAPI.Profiling; -using Unity.Profiling; using UnityEditor; -using UnityEngine; namespace MLAPI { diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs b/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs index c70681cd21..8fc3347c6b 100644 --- a/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs +++ b/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Reflection; using UnityEditor; using UnityEngine; using UnityEditorInternal; diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs index 07390f2536..6651f48150 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs @@ -25,6 +25,7 @@ namespace MLAPI /// public abstract class NetworkBehaviour : MonoBehaviour { +#pragma warning disable IDE1006 [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] #if UNITY_2020_2_OR_NEWER @@ -34,6 +35,7 @@ internal enum __NExec [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public enum __NExec #endif +#pragma warning restore IDE1006 { None = 0, Server = 1, @@ -41,6 +43,7 @@ public enum __NExec } #pragma warning disable 414 +#pragma warning disable IDE1006 [NonSerialized] [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] @@ -53,7 +56,9 @@ public enum __NExec public __NExec __nexec = __NExec.None; #endif #pragma warning restore 414 +#pragma warning restore IDE1006 +#pragma warning disable IDE1006 [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] #if UNITY_2020_2_OR_NEWER @@ -63,6 +68,7 @@ internal NetworkSerializer __beginSendServerRpc(ServerRpcParams serverRpcParams, [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public NetworkSerializer __beginSendServerRpc(ServerRpcParams serverRpcParams, RpcDelivery rpcDelivery) #endif +#pragma warning restore IDE1006 { PooledNetworkWriter writer; @@ -97,6 +103,7 @@ public NetworkSerializer __beginSendServerRpc(ServerRpcParams serverRpcParams, R return writer.Serializer; } +#pragma warning disable IDE1006 [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] #if UNITY_2020_2_OR_NEWER @@ -106,6 +113,7 @@ internal void __endSendServerRpc(NetworkSerializer serializer, ServerRpcParams s [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public void __endSendServerRpc(NetworkSerializer serializer, ServerRpcParams serverRpcParams, RpcDelivery rpcDelivery) #endif +#pragma warning restore IDE1006 { if (serializer == null) { @@ -123,6 +131,7 @@ public void __endSendServerRpc(NetworkSerializer serializer, ServerRpcParams ser } } +#pragma warning disable IDE1006 [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] #if UNITY_2020_2_OR_NEWER @@ -132,6 +141,7 @@ internal NetworkSerializer __beginSendClientRpc(ClientRpcParams clientRpcParams, [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public NetworkSerializer __beginSendClientRpc(ClientRpcParams clientRpcParams, RpcDelivery rpcDelivery) #endif +#pragma warning restore IDE1006 { PooledNetworkWriter writer; @@ -140,32 +150,32 @@ public NetworkSerializer __beginSendClientRpc(ClientRpcParams clientRpcParams, R var isUsingBatching = rpcQueueContainer.IsUsingBatching(); var transportChannel = rpcDelivery == RpcDelivery.Reliable ? NetworkChannel.ReliableRpc : NetworkChannel.UnreliableRpc; - ulong[] ClientIds = clientRpcParams.Send.TargetClientIds ?? NetworkManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray(); + ulong[] clientIds = clientRpcParams.Send.TargetClientIds ?? NetworkManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray(); if (clientRpcParams.Send.TargetClientIds != null && clientRpcParams.Send.TargetClientIds.Length == 0) { - ClientIds = NetworkManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray(); + clientIds = NetworkManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray(); } //NOTES ON BELOW CHANGES: //The following checks for IsHost and whether the host client id is part of the clients to recieve the RPC //Is part of a patch-fix to handle looping back RPCs into the next frame's inbound queue. //!!! This code is temporary and will change (soon) when NetworkSerializer can be configured for mutliple NetworkWriters!!! - var ContainsServerClientId = ClientIds.Contains(NetworkManager.Singleton.ServerClientId); - if (IsHost && ContainsServerClientId) + var containsServerClientId = clientIds.Contains(NetworkManager.Singleton.ServerClientId); + if (IsHost && containsServerClientId) { //Always write to the next frame's inbound queue writer = rpcQueueContainer.BeginAddQueueItemToFrame(RpcQueueContainer.QueueItemType.ClientRpc, Time.realtimeSinceStartup, transportChannel, NetworkManager.Singleton.ServerClientId, null, RpcQueueHistoryFrame.QueueFrameType.Inbound, clientRpcParams.Send.UpdateStage); //Handle sending to the other clients, if so the above notes explain why this code is here (a temporary patch-fix) - if (ClientIds.Length > 1) + if (clientIds.Length > 1) { //Set the loopback frame rpcQueueContainer.SetLoopBackFrameItem(clientRpcParams.Send.UpdateStage); //Switch to the outbound queue writer = rpcQueueContainer.BeginAddQueueItemToFrame(RpcQueueContainer.QueueItemType.ClientRpc, Time.realtimeSinceStartup, transportChannel, NetworkObjectId, - ClientIds, RpcQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate); + clientIds, RpcQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate); if (!isUsingBatching) { @@ -183,7 +193,7 @@ public NetworkSerializer __beginSendClientRpc(ClientRpcParams clientRpcParams, R else { writer = rpcQueueContainer.BeginAddQueueItemToFrame(RpcQueueContainer.QueueItemType.ClientRpc, Time.realtimeSinceStartup, transportChannel, NetworkObjectId, - ClientIds, RpcQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate); + clientIds, RpcQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate); if (!isUsingBatching) { @@ -198,6 +208,7 @@ public NetworkSerializer __beginSendClientRpc(ClientRpcParams clientRpcParams, R return writer.Serializer; } +#pragma warning disable IDE1006 [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] #if UNITY_2020_2_OR_NEWER @@ -207,6 +218,7 @@ internal void __endSendClientRpc(NetworkSerializer serializer, ClientRpcParams c [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public void __endSendClientRpc(NetworkSerializer serializer, ClientRpcParams clientRpcParams, RpcDelivery rpcDelivery) #endif +#pragma warning restore IDE1006 { if (serializer == null) { @@ -217,14 +229,14 @@ public void __endSendClientRpc(NetworkSerializer serializer, ClientRpcParams cli if (IsHost) { - ulong[] ClientIds = clientRpcParams.Send.TargetClientIds ?? NetworkManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray(); + ulong[] clientIds = clientRpcParams.Send.TargetClientIds ?? NetworkManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray(); if (clientRpcParams.Send.TargetClientIds != null && clientRpcParams.Send.TargetClientIds.Length == 0) { - ClientIds = NetworkManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray(); + clientIds = NetworkManager.Singleton.ConnectedClientsList.Select(c => c.ClientId).ToArray(); } - var ContainsServerClientId = ClientIds.Contains(NetworkManager.Singleton.ServerClientId); - if (ContainsServerClientId && ClientIds.Length == 1) + var containsServerClientId = clientIds.Contains(NetworkManager.Singleton.ServerClientId); + if (containsServerClientId && clientIds.Length == 1) { rpcQueueContainer.EndAddQueueItemToFrame(serializer.Writer, RpcQueueHistoryFrame.QueueFrameType.Inbound, clientRpcParams.Send.UpdateStage); return; diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs index fd43eea24c..2ff08d2ace 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs @@ -31,6 +31,7 @@ namespace MLAPI [AddComponentMenu("MLAPI/NetworkManager", -100)] public class NetworkManager : MonoBehaviour, INetworkUpdateSystem, IProfilableTransportProvider { +#pragma warning disable IDE1006 [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] [DebuggerBrowsable(DebuggerBrowsableState.Never)] @@ -41,6 +42,7 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem, IProfilableTr [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public static readonly Dictionary> __ntable = new Dictionary>(); #endif +#pragma warning restore IDE1006 #if DEVELOPMENT_BUILD || UNITY_EDITOR private static ProfilerMarker s_EventTick = new ProfilerMarker($"{nameof(NetworkManager)}.EventTick"); @@ -610,7 +612,7 @@ public SocketTasks StartHost(Vector3? position = null, Quaternion? rotation = nu if (networkObject.CheckObjectVisibility == null || networkObject.CheckObjectVisibility(hostClientId)) { - networkObject.m_Observers.Add(hostClientId); + networkObject.Observers.Add(hostClientId); } } @@ -1379,7 +1381,7 @@ internal void OnClientDisconnectFromServer(ulong clientId) foreach (var sobj in NetworkSpawnManager.SpawnedObjectsList) { - sobj.m_Observers.Remove(clientId); + sobj.Observers.Remove(clientId); } } @@ -1457,7 +1459,7 @@ internal void HandleApproval(ulong clientId, bool createPlayerObject, ulong? pla if (clientId == ServerClientId || sobj.CheckObjectVisibility == null || sobj.CheckObjectVisibility(clientId)) { m_ObservedObjects.Add(sobj); - sobj.m_Observers.Add(clientId); + sobj.Observers.Add(clientId); } } @@ -1556,7 +1558,7 @@ internal void HandleApproval(ulong clientId, bool createPlayerObject, ulong? pla { if (clientPair.Key == clientId || ConnectedClients[clientId].PlayerObject == null || - !ConnectedClients[clientId].PlayerObject.m_Observers.Contains(clientPair.Key)) + !ConnectedClients[clientId].PlayerObject.Observers.Contains(clientPair.Key)) { continue; //The new client. } diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs index 0f67c4e319..8e780fec59 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs @@ -169,7 +169,7 @@ internal set /// public bool DontDestroyWithOwner; - internal readonly HashSet m_Observers = new HashSet(); + internal readonly HashSet Observers = new HashSet(); /// /// Returns Observers enumerator @@ -182,7 +182,7 @@ public HashSet.Enumerator GetObservers() throw new SpawnStateException("Object is not spawned"); } - return m_Observers.GetEnumerator(); + return Observers.GetEnumerator(); } /// @@ -197,7 +197,7 @@ public bool IsNetworkVisibleTo(ulong clientId) throw new SpawnStateException("Object is not spawned"); } - return m_Observers.Contains(clientId); + return Observers.Contains(clientId); } /// @@ -217,13 +217,13 @@ public void NetworkShow(ulong clientId, Stream payload = null) throw new NotServerException("Only server can change visibility"); } - if (m_Observers.Contains(clientId)) + if (Observers.Contains(clientId)) { throw new VisibilityChangeException("The object is already visible"); } // Send spawn call - m_Observers.Add(clientId); + Observers.Add(clientId); NetworkSpawnManager.SendSpawnCallForObject(clientId, this, payload); } @@ -249,7 +249,7 @@ public static void NetworkShow(List networkObjects, ulong clientI throw new SpawnStateException("Object is not spawned"); } - if (networkObjects[i].m_Observers.Contains(clientId)) + if (networkObjects[i].Observers.Contains(clientId)) { throw new VisibilityChangeException($"{nameof(NetworkObject)} with NetworkId: {networkObjects[i].NetworkObjectId} is already visible"); } @@ -263,7 +263,7 @@ public static void NetworkShow(List networkObjects, ulong clientI for (int i = 0; i < networkObjects.Count; i++) { // Send spawn call - networkObjects[i].m_Observers.Add(clientId); + networkObjects[i].Observers.Add(clientId); NetworkSpawnManager.WriteSpawnCallForObject(buffer, clientId, networkObjects[i], payload); } @@ -288,7 +288,7 @@ public void NetworkHide(ulong clientId) throw new NotServerException("Only server can change visibility"); } - if (!m_Observers.Contains(clientId)) + if (!Observers.Contains(clientId)) { throw new VisibilityChangeException("The object is already hidden"); } @@ -300,7 +300,7 @@ public void NetworkHide(ulong clientId) // Send destroy call - m_Observers.Remove(clientId); + Observers.Remove(clientId); using (var buffer = PooledNetworkBuffer.Get()) using (var writer = PooledNetworkWriter.Get(buffer)) @@ -336,7 +336,7 @@ public static void NetworkHide(List networkObjects, ulong clientI throw new SpawnStateException("Object is not spawned"); } - if (!networkObjects[i].m_Observers.Contains(clientId)) + if (!networkObjects[i].Observers.Contains(clientId)) { throw new VisibilityChangeException($"{nameof(NetworkObject)} with {nameof(NetworkObjectId)}: {networkObjects[i].NetworkObjectId} is already hidden"); } @@ -350,7 +350,7 @@ public static void NetworkHide(List networkObjects, ulong clientI for (int i = 0; i < networkObjects.Count; i++) { // Send destroy call - networkObjects[i].m_Observers.Remove(clientId); + networkObjects[i].Observers.Remove(clientId); writer.WriteUInt64Packed(networkObjects[i].NetworkObjectId); } @@ -389,7 +389,7 @@ private void SpawnInternal(Stream spawnPayload, bool destroyWithScene, ulong? ow for (int i = 0; i < NetworkManager.Singleton.ConnectedClientsList.Count; i++) { - if (m_Observers.Contains(NetworkManager.Singleton.ConnectedClientsList[i].ClientId)) + if (Observers.Contains(NetworkManager.Singleton.ConnectedClientsList[i].ClientId)) { NetworkSpawnManager.SendSpawnCallForObject(NetworkManager.Singleton.ConnectedClientsList[i].ClientId, this, spawnPayload); } diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcBatcher.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcBatcher.cs index 0cfaa8825c..323a03e0c7 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcBatcher.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcBatcher.cs @@ -27,7 +27,7 @@ public SendStream() } // Stores the stream of batched RPC to send to each client, by ClientId - private readonly Dictionary k_SendDict = new Dictionary(); + private readonly Dictionary m_SendDict = new Dictionary(); // Used to store targets, internally private ulong[] m_TargetList = new ulong[0]; @@ -114,35 +114,35 @@ public void QueueItem(in RpcFrameQueueItem queueItem) foreach (ulong clientId in m_TargetList) { - if (!k_SendDict.ContainsKey(clientId)) + if (!m_SendDict.ContainsKey(clientId)) { // todo: consider what happens if many clients join and leave the game consecutively // we probably need a cleanup mechanism at some point - k_SendDict[clientId] = new SendStream(); + m_SendDict[clientId] = new SendStream(); } - if (k_SendDict[clientId].IsEmpty) + if (m_SendDict[clientId].IsEmpty) { - k_SendDict[clientId].IsEmpty = false; - k_SendDict[clientId].NetworkChannel = queueItem.NetworkChannel; + m_SendDict[clientId].IsEmpty = false; + m_SendDict[clientId].NetworkChannel = queueItem.NetworkChannel; switch (queueItem.QueueItemType) { // 8 bits are used for the message type, which is an NetworkConstants case RpcQueueContainer.QueueItemType.ServerRpc: - k_SendDict[clientId].Writer.WriteByte(NetworkConstants.SERVER_RPC); // MessageType + m_SendDict[clientId].Writer.WriteByte(NetworkConstants.SERVER_RPC); // MessageType break; case RpcQueueContainer.QueueItemType.ClientRpc: - k_SendDict[clientId].Writer.WriteByte(NetworkConstants.CLIENT_RPC); // MessageType + m_SendDict[clientId].Writer.WriteByte(NetworkConstants.CLIENT_RPC); // MessageType break; } } // write the amounts of bytes that are coming up - PushLength(queueItem.MessageData.Count, ref k_SendDict[clientId].Writer); + PushLength(queueItem.MessageData.Count, ref m_SendDict[clientId].Writer); // write the message to send - k_SendDict[clientId].Writer.WriteBytes(queueItem.MessageData.Array, queueItem.MessageData.Count, queueItem.MessageData.Offset); + m_SendDict[clientId].Writer.WriteBytes(queueItem.MessageData.Array, queueItem.MessageData.Count, queueItem.MessageData.Offset); ProfilerStatManager.BytesSent.Record(queueItem.MessageData.Count); ProfilerStatManager.RpcsSent.Record(); @@ -163,12 +163,12 @@ public void QueueItem(in RpcFrameQueueItem queueItem) /// the function to call for sending the batch public void SendItems(int thresholdBytes, SendCallbackType sendCallback) { - foreach (KeyValuePair entry in k_SendDict) + foreach (KeyValuePair entry in m_SendDict) { if (!entry.Value.IsEmpty) { // read the queued message - int length = (int)k_SendDict[entry.Key].Buffer.Length; + int length = (int)m_SendDict[entry.Key].Buffer.Length; if (length >= thresholdBytes) { diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs index e889521810..1e73b165ea 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs @@ -36,6 +36,7 @@ public struct ClientRpcParams public ClientRpcReceiveParams Receive; } +#pragma warning disable IDE1006 #if UNITY_2020_2_OR_NEWER // RuntimeAccessModifiersILPP will make this `public` internal struct __RpcParams @@ -43,6 +44,7 @@ internal struct __RpcParams [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public struct __RpcParams #endif +#pragma warning restore IDE1006 { public ServerRpcParams Server; public ClientRpcParams Client; diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueContainer.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueContainer.cs index a53ccd35e0..151940ed01 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueContainer.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueContainer.cs @@ -37,7 +37,7 @@ public enum RpcQueueProcessingTypes } // Inbound and Outbound QueueHistoryFrames - private readonly Dictionary>> QueueHistory = + private readonly Dictionary>> m_QueueHistory = new Dictionary>>(); private RpcQueueProcessor m_RpcQueueProcessor; @@ -51,7 +51,7 @@ public enum RpcQueueProcessingTypes private bool m_ProcessUpdateStagesExternally; private bool m_IsNotUsingBatching; - internal readonly NetworkManager m_NetworkManager; + internal readonly NetworkManager NetworkManager; /// /// Returns if batching is enabled @@ -104,7 +104,7 @@ public void AddToInternalMLAPISendQueue(RpcFrameQueueItem queueItem) /// Network Update Stage assigned RpcQueueHistoryFrame to be processed and flushed public void ProcessAndFlushRpcQueue(RpcQueueProcessingTypes queueType, NetworkUpdateStage currentUpdateStage) { - bool isListening = !ReferenceEquals(m_NetworkManager, null) && m_NetworkManager.IsListening; + bool isListening = !ReferenceEquals(NetworkManager, null) && NetworkManager.IsListening; switch (queueType) { case RpcQueueProcessingTypes.Receive: @@ -128,15 +128,15 @@ public void ProcessAndFlushRpcQueue(RpcQueueProcessingTypes queueType, NetworkUp /// QueueHistoryFrame public RpcQueueHistoryFrame GetCurrentFrame(RpcQueueHistoryFrame.QueueFrameType qType, NetworkUpdateStage currentUpdateStage) { - if (QueueHistory.ContainsKey(qType)) + if (m_QueueHistory.ContainsKey(qType)) { - int StreamBufferIndex = GetStreamBufferIndex(qType); + int streamBufferIndex = GetStreamBufferIndex(qType); - if (QueueHistory[qType].ContainsKey(StreamBufferIndex)) + if (m_QueueHistory[qType].ContainsKey(streamBufferIndex)) { - if (QueueHistory[qType][StreamBufferIndex].ContainsKey(currentUpdateStage)) + if (m_QueueHistory[qType][streamBufferIndex].ContainsKey(currentUpdateStage)) { - return QueueHistory[qType][StreamBufferIndex][currentUpdateStage]; + return m_QueueHistory[qType][streamBufferIndex][currentUpdateStage]; } } } @@ -163,20 +163,20 @@ public void AdvanceFrameHistory(RpcQueueHistoryFrame.QueueFrameType queueType) { int streamBufferIndex = GetStreamBufferIndex(queueType); - if (!QueueHistory.ContainsKey(queueType)) + if (!m_QueueHistory.ContainsKey(queueType)) { UnityEngine.Debug.LogError($"You must initialize the {nameof(RpcQueueContainer)} before using MLAPI!"); return; } - if (!QueueHistory[queueType].ContainsKey(streamBufferIndex)) + if (!m_QueueHistory[queueType].ContainsKey(streamBufferIndex)) { UnityEngine.Debug.LogError($"{nameof(RpcQueueContainer)} {queueType} queue stream buffer index out of range! [{streamBufferIndex}]"); return; } - foreach (KeyValuePair queueHistoryByUpdates in QueueHistory[queueType][streamBufferIndex]) + foreach (KeyValuePair queueHistoryByUpdates in m_QueueHistory[queueType][streamBufferIndex]) { var rpcQueueHistoryItem = queueHistoryByUpdates.Value; @@ -280,7 +280,7 @@ internal void AddQueueItemToInboundFrame(QueueItemType qItemType, float timeStam var rpcQueueHistoryItem = GetQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrameType.Inbound, updateStage); rpcQueueHistoryItem.IsDirty = true; - long StartPosition = rpcQueueHistoryItem.QueueBuffer.Position; + long startPosition = rpcQueueHistoryItem.QueueBuffer.Position; //Write the packed version of the queueItem to our current queue history buffer rpcQueueHistoryItem.QueueWriter.WriteUInt16((ushort)qItemType); @@ -297,7 +297,7 @@ internal void AddQueueItemToInboundFrame(QueueItemType qItemType, float timeStam rpcQueueHistoryItem.QueueItemOffsets.Add((uint)rpcQueueHistoryItem.QueueBuffer.Position); //Calculate the packed size based on stream progression - rpcQueueHistoryItem.TotalSize += (uint)(rpcQueueHistoryItem.QueueBuffer.Position - StartPosition); + rpcQueueHistoryItem.TotalSize += (uint)(rpcQueueHistoryItem.QueueBuffer.Position - startPosition); } /// @@ -352,7 +352,7 @@ public RpcQueueHistoryFrame GetLoopBackHistoryFrame(RpcQueueHistoryFrame.QueueFr public PooledNetworkWriter BeginAddQueueItemToFrame(QueueItemType qItemType, float timeStamp, NetworkChannel networkChannel, ulong sourceNetworkId, ulong[] targetNetworkIds, RpcQueueHistoryFrame.QueueFrameType queueFrameType, NetworkUpdateStage updateStage) { - bool getNextFrame = m_NetworkManager.IsHost && queueFrameType == RpcQueueHistoryFrame.QueueFrameType.Inbound; + bool getNextFrame = NetworkManager.IsHost && queueFrameType == RpcQueueHistoryFrame.QueueFrameType.Inbound; var rpcQueueHistoryItem = GetQueueHistoryFrame(queueFrameType, updateStage, getNextFrame); rpcQueueHistoryItem.IsDirty = true; @@ -373,7 +373,7 @@ public PooledNetworkWriter BeginAddQueueItemToFrame(QueueItemType qItemType, flo var numberOfClients = 0; for (int i = 0; i < targetNetworkIds.Length; i++) { - if (m_NetworkManager.IsHost && targetNetworkIds[i] == m_NetworkManager.ServerClientId) + if (NetworkManager.IsHost && targetNetworkIds[i] == NetworkManager.ServerClientId) { continue; } @@ -387,7 +387,7 @@ public PooledNetworkWriter BeginAddQueueItemToFrame(QueueItemType qItemType, flo //Now write the cliend ids for (int i = 0; i < targetNetworkIds.Length; i++) { - if (m_NetworkManager.IsHost && targetNetworkIds[i] == m_NetworkManager.ServerClientId) + if (NetworkManager.IsHost && targetNetworkIds[i] == NetworkManager.ServerClientId) { continue; } @@ -407,7 +407,7 @@ public PooledNetworkWriter BeginAddQueueItemToFrame(QueueItemType qItemType, flo //Write a filler dummy size of 0 to hold this position in order to write to it once the RPC is done writing. rpcQueueHistoryItem.QueueWriter.WriteInt64(0); - if (m_NetworkManager.IsHost && queueFrameType == RpcQueueHistoryFrame.QueueFrameType.Inbound) + if (NetworkManager.IsHost && queueFrameType == RpcQueueHistoryFrame.QueueFrameType.Inbound) { if (!IsUsingBatching()) { @@ -434,7 +434,7 @@ public PooledNetworkWriter BeginAddQueueItemToFrame(QueueItemType qItemType, flo /// stage the RPC is going to be invoked public void EndAddQueueItemToFrame(NetworkWriter writer, RpcQueueHistoryFrame.QueueFrameType queueFrameType, NetworkUpdateStage updateStage) { - bool getNextFrame = m_NetworkManager.IsHost && queueFrameType == RpcQueueHistoryFrame.QueueFrameType.Inbound; + bool getNextFrame = NetworkManager.IsHost && queueFrameType == RpcQueueHistoryFrame.QueueFrameType.Inbound; var rpcQueueHistoryItem = GetQueueHistoryFrame(queueFrameType, updateStage, getNextFrame); var loopBackHistoryFrame = rpcQueueHistoryItem.LoopbackHistoryFrame; @@ -549,25 +549,25 @@ public RpcQueueHistoryFrame GetQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrame } } - if (!QueueHistory.ContainsKey(frameType)) + if (!m_QueueHistory.ContainsKey(frameType)) { UnityEngine.Debug.LogError($"{nameof(RpcQueueHistoryFrame)} {nameof(RpcQueueHistoryFrame.QueueFrameType)} {frameType} does not exist!"); return null; } - if (!QueueHistory[frameType].ContainsKey(streamBufferIndex)) + if (!m_QueueHistory[frameType].ContainsKey(streamBufferIndex)) { UnityEngine.Debug.LogError($"{nameof(RpcQueueContainer)} {frameType} queue stream buffer index out of range! [{streamBufferIndex}]"); return null; } - if (!QueueHistory[frameType][streamBufferIndex].ContainsKey(updateStage)) + if (!m_QueueHistory[frameType][streamBufferIndex].ContainsKey(updateStage)) { UnityEngine.Debug.LogError($"{nameof(RpcQueueContainer)} {updateStage} update type does not exist!"); return null; } - return QueueHistory[frameType][streamBufferIndex][updateStage]; + return m_QueueHistory[frameType][streamBufferIndex][updateStage]; } /// @@ -608,21 +608,21 @@ private void Initialize(uint maxFrameHistory) m_RpcQueueProcessor = new RpcQueueProcessor(this); m_MaxFrameHistory = maxFrameHistory + k_MinQueueHistory; - if (!QueueHistory.ContainsKey(RpcQueueHistoryFrame.QueueFrameType.Inbound)) + if (!m_QueueHistory.ContainsKey(RpcQueueHistoryFrame.QueueFrameType.Inbound)) { - QueueHistory.Add(RpcQueueHistoryFrame.QueueFrameType.Inbound, new Dictionary>()); + m_QueueHistory.Add(RpcQueueHistoryFrame.QueueFrameType.Inbound, new Dictionary>()); } - if (!QueueHistory.ContainsKey(RpcQueueHistoryFrame.QueueFrameType.Outbound)) + if (!m_QueueHistory.ContainsKey(RpcQueueHistoryFrame.QueueFrameType.Outbound)) { - QueueHistory.Add(RpcQueueHistoryFrame.QueueFrameType.Outbound, new Dictionary>()); + m_QueueHistory.Add(RpcQueueHistoryFrame.QueueFrameType.Outbound, new Dictionary>()); } for (int i = 0; i < m_MaxFrameHistory; i++) { - if (!QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Outbound].ContainsKey(i)) + if (!m_QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Outbound].ContainsKey(i)) { - QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Outbound].Add(i, new Dictionary()); + m_QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Outbound].Add(i, new Dictionary()); var queueHistoryFrame = new RpcQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate); queueHistoryFrame.QueueBuffer = PooledNetworkBuffer.Get(); queueHistoryFrame.QueueBuffer.Position = 0; @@ -631,12 +631,12 @@ private void Initialize(uint maxFrameHistory) queueHistoryFrame.QueueItemOffsets = new List(); //For now all outbound, we will always have a single update in which they are processed (LATEUPDATE) - QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Outbound][i].Add(NetworkUpdateStage.PostLateUpdate, queueHistoryFrame); + m_QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Outbound][i].Add(NetworkUpdateStage.PostLateUpdate, queueHistoryFrame); } - if (!QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Inbound].ContainsKey(i)) + if (!m_QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Inbound].ContainsKey(i)) { - QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Inbound].Add(i, new Dictionary()); + m_QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Inbound].Add(i, new Dictionary()); //For inbound, we create a queue history frame per update stage foreach (NetworkUpdateStage netUpdateStage in Enum.GetValues(typeof(NetworkUpdateStage))) @@ -647,7 +647,7 @@ private void Initialize(uint maxFrameHistory) rpcQueueHistoryFrame.QueueWriter = PooledNetworkWriter.Get(rpcQueueHistoryFrame.QueueBuffer); rpcQueueHistoryFrame.QueueReader = PooledNetworkReader.Get(rpcQueueHistoryFrame.QueueBuffer); rpcQueueHistoryFrame.QueueItemOffsets = new List(); - QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Inbound][i].Add(netUpdateStage, rpcQueueHistoryFrame); + m_QueueHistory[RpcQueueHistoryFrame.QueueFrameType.Inbound][i].Add(netUpdateStage, rpcQueueHistoryFrame); } } } @@ -693,10 +693,10 @@ private void Shutdown() } //Make sure any remaining internal messages are sent before completely shutting down. - m_RpcQueueProcessor.InternalMessagesSendAndFlush(m_NetworkManager.IsListening); + m_RpcQueueProcessor.InternalMessagesSendAndFlush(NetworkManager.IsListening); //Dispose of any readers and writers - foreach (var queueHistorySection in QueueHistory) + foreach (var queueHistorySection in m_QueueHistory) { foreach (var queueHistoryItemByStage in queueHistorySection.Value) { @@ -710,7 +710,7 @@ private void Shutdown() } //Clear history and parameters - QueueHistory.Clear(); + m_QueueHistory.Clear(); ClearParameters(); } @@ -753,7 +753,7 @@ public void Dispose() /// determines if it handles processing externally public RpcQueueContainer(NetworkManager networkManager, uint maxFrameHistory = 0, bool processExternally = false) { - m_NetworkManager = networkManager; + NetworkManager = networkManager; #if UNITY_EDITOR || DEVELOPMENT_BUILD //Keep track of how many instances we have instantiated diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueHistoryFrame.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueHistoryFrame.cs index 31d03d1ae7..f9559cf711 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueHistoryFrame.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueHistoryFrame.cs @@ -88,11 +88,11 @@ private RpcFrameQueueItem GetCurrentQueueItem() { //Outbound we care about both channel and clients m_CurrentQueueItem.NetworkChannel = (NetworkChannel)QueueReader.ReadByteDirect(); - int NumClients = QueueReader.ReadInt32(); - if (NumClients > 0 && NumClients < m_MaximumClients) + int numClients = QueueReader.ReadInt32(); + if (numClients > 0 && numClients < m_MaximumClients) { - ulong[] clientIdArray = new ulong[NumClients]; - for (int i = 0; i < NumClients; i++) + ulong[] clientIdArray = new ulong[numClients]; + for (int i = 0; i < numClients; i++) { clientIdArray[i] = QueueReader.ReadUInt64(); } @@ -120,7 +120,7 @@ private RpcFrameQueueItem GetCurrentQueueItem() if (m_QueueFrameType == QueueFrameType.Inbound) { //Get our offset - long Position = QueueReader.ReadInt64(); + long position = QueueReader.ReadInt64(); //Always make sure we are positioned at the start of the stream before we write m_CurrentQueueItem.NetworkBuffer.Position = 0; @@ -130,7 +130,7 @@ private RpcFrameQueueItem GetCurrentQueueItem() //Reset the position back to the offset so std rpc API can process the message properly //(i.e. minus the already processed header) - m_CurrentQueueItem.NetworkBuffer.Position = Position; + m_CurrentQueueItem.NetworkBuffer.Position = position; } else { diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueProcessor.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueProcessor.cs index b18ef4926b..2b94b87f60 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueProcessor.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueProcessor.cs @@ -28,7 +28,7 @@ internal class RpcQueueProcessor private readonly List m_InternalMLAPISendQueue = new List(); //The RpcQueueContainer that is associated with this RpcQueueProcessor - internal RpcQueueContainer m_RpcQueueContainer; + internal RpcQueueContainer RpcQueueContainer; /// /// ProcessReceiveQueue @@ -37,13 +37,13 @@ internal class RpcQueueProcessor public void ProcessReceiveQueue(NetworkUpdateStage currentStage, bool isTesting) { bool advanceFrameHistory = false; - if (!ReferenceEquals(m_RpcQueueContainer, null)) + if (!ReferenceEquals(RpcQueueContainer, null)) { #if DEVELOPMENT_BUILD || UNITY_EDITOR s_ProcessReceiveQueue.Begin(); #endif - var currentFrame = m_RpcQueueContainer.GetQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrameType.Inbound, currentStage); - var nextFrame = m_RpcQueueContainer.GetQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrameType.Inbound, currentStage, true); + var currentFrame = RpcQueueContainer.GetQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrameType.Inbound, currentStage); + var nextFrame = RpcQueueContainer.GetQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrameType.Inbound, currentStage, true); if (nextFrame.IsDirty && nextFrame.HasLoopbackData) { advanceFrameHistory = true; @@ -72,7 +72,7 @@ public void ProcessReceiveQueue(NetworkUpdateStage currentStage, bool isTesting) if (advanceFrameHistory) { - m_RpcQueueContainer.AdvanceFrameHistory(RpcQueueHistoryFrame.QueueFrameType.Inbound); + RpcQueueContainer.AdvanceFrameHistory(RpcQueueHistoryFrame.QueueFrameType.Inbound); } #if DEVELOPMENT_BUILD || UNITY_EDITOR @@ -116,7 +116,7 @@ internal void InternalMessagesSendAndFlush(bool isListening) { foreach (RpcFrameQueueItem queueItem in m_InternalMLAPISendQueue) { - var PoolStream = queueItem.NetworkBuffer; + var poolStream = queueItem.NetworkBuffer; switch (queueItem.QueueItemType) { @@ -126,7 +126,7 @@ internal void InternalMessagesSendAndFlush(bool isListening) { foreach (ulong clientId in queueItem.ClientNetworkIds) { - InternalMessageSender.Send(clientId, NetworkConstants.ADD_OBJECT, queueItem.NetworkChannel, PoolStream); + InternalMessageSender.Send(clientId, NetworkConstants.ADD_OBJECT, queueItem.NetworkChannel, poolStream); } PerformanceDataManager.Increment(ProfilerConstants.RpcSent, queueItem.ClientNetworkIds.Length); @@ -144,7 +144,7 @@ internal void InternalMessagesSendAndFlush(bool isListening) { foreach (ulong clientId in queueItem.ClientNetworkIds) { - InternalMessageSender.Send(clientId, NetworkConstants.DESTROY_OBJECT, queueItem.NetworkChannel, PoolStream); + InternalMessageSender.Send(clientId, NetworkConstants.DESTROY_OBJECT, queueItem.NetworkChannel, poolStream); } PerformanceDataManager.Increment(ProfilerConstants.RpcSent, queueItem.ClientNetworkIds.Length); @@ -158,7 +158,7 @@ internal void InternalMessagesSendAndFlush(bool isListening) } } - PoolStream.Dispose(); + poolStream.Dispose(); } m_InternalMLAPISendQueue.Clear(); @@ -171,16 +171,16 @@ internal void InternalMessagesSendAndFlush(bool isListening) private void RpcQueueSendAndFlush(bool isListening) { var advanceFrameHistory = false; - if (!ReferenceEquals(m_RpcQueueContainer, null)) + if (!ReferenceEquals(RpcQueueContainer, null)) { - var currentFrame = m_RpcQueueContainer.GetCurrentFrame(RpcQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate); + var currentFrame = RpcQueueContainer.GetCurrentFrame(RpcQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate); if (currentFrame != null) { var currentQueueItem = currentFrame.GetFirstQueueItem(); while (currentQueueItem.QueueItemType != RpcQueueContainer.QueueItemType.None) { advanceFrameHistory = true; - if (m_RpcQueueContainer.IsUsingBatching()) + if (RpcQueueContainer.IsUsingBatching()) { m_RpcBatcher.QueueItem(currentQueueItem); @@ -201,7 +201,7 @@ private void RpcQueueSendAndFlush(bool isListening) } //If the size is < m_BatchThreshold then just send the messages - if (advanceFrameHistory && m_RpcQueueContainer.IsUsingBatching()) + if (advanceFrameHistory && RpcQueueContainer.IsUsingBatching()) { m_RpcBatcher.SendItems(0, SendCallback); } @@ -210,7 +210,7 @@ private void RpcQueueSendAndFlush(bool isListening) //If we processed any RPCs, then advance to the next frame if (advanceFrameHistory) { - m_RpcQueueContainer.AdvanceFrameHistory(RpcQueueHistoryFrame.QueueFrameType.Outbound); + RpcQueueContainer.AdvanceFrameHistory(RpcQueueHistoryFrame.QueueFrameType.Outbound); } } } @@ -226,7 +226,7 @@ private void SendCallback(ulong clientId, RpcBatcher.SendStream sendStream) var bytes = sendStream.Buffer.GetBuffer(); var sendBuffer = new ArraySegment(bytes, 0, length); - m_RpcQueueContainer.m_NetworkManager.NetworkConfig.NetworkTransport.Send(clientId, sendBuffer, sendStream.NetworkChannel); + RpcQueueContainer.NetworkManager.NetworkConfig.NetworkTransport.Send(clientId, sendBuffer, sendStream.NetworkChannel); } /// @@ -240,7 +240,7 @@ private void SendFrameQueueItem(RpcFrameQueueItem queueItem) { case RpcQueueContainer.QueueItemType.ServerRpc: { - m_RpcQueueContainer.m_NetworkManager.NetworkConfig.NetworkTransport.Send(queueItem.NetworkId, queueItem.MessageData, queueItem.NetworkChannel); + RpcQueueContainer.NetworkManager.NetworkConfig.NetworkTransport.Send(queueItem.NetworkId, queueItem.MessageData, queueItem.NetworkChannel); //For each packet sent, we want to record how much data we have sent @@ -254,7 +254,7 @@ private void SendFrameQueueItem(RpcFrameQueueItem queueItem) { foreach (ulong clientid in queueItem.ClientNetworkIds) { - m_RpcQueueContainer.m_NetworkManager.NetworkConfig.NetworkTransport.Send(clientid, queueItem.MessageData, queueItem.NetworkChannel); + RpcQueueContainer.NetworkManager.NetworkConfig.NetworkTransport.Send(clientid, queueItem.MessageData, queueItem.NetworkChannel); //For each packet sent, we want to record how much data we have sent PerformanceDataManager.Increment(ProfilerConstants.ByteSent, (int)queueItem.StreamSize); @@ -272,7 +272,7 @@ private void SendFrameQueueItem(RpcFrameQueueItem queueItem) internal RpcQueueProcessor(RpcQueueContainer rpcQueueContainer) { - m_RpcQueueContainer = rpcQueueContainer; + RpcQueueContainer = rpcQueueContainer; } } } diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs index 70e5374daf..9cc30ee305 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using UnityEngine; namespace MLAPI.Profiling { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs index 080749bfd4..fc3944e3e4 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Linq; namespace MLAPI.Profiling { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs index 9d3ae31826..b776b36a42 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs @@ -1,5 +1,3 @@ -using System; - #if UNITY_2020_2_OR_NEWER using Unity.Profiling.LowLevel; #endif diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs index d8b2c9d9bc..674f7219b3 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs @@ -1,7 +1,4 @@ -using System; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Unity.Collections.LowLevel.Unsafe; #if UNITY_2020_2_OR_NEWER using Unity.Profiling; using Unity.Profiling.LowLevel; diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs index e4977db766..8fe3a3d76a 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs @@ -1,7 +1,6 @@ #if UNITY_2020_2_OR_NEWER using Unity.Profiling; #endif -using UnityEngine; namespace MLAPI.Profiling { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs index 4a20e0083b..5b6a2c4eaf 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs @@ -35,7 +35,9 @@ public static void ProfilerBeginTick() public static void NotifyProfilerListeners() { if (!s_FailsafeCheck) + { return; + } s_FailsafeCheck = false; diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs index b91b0fe7a8..f6296b6f5f 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs @@ -18,39 +18,39 @@ public ProfilerStat(string name) } public string PrettyPrintName; - protected int MaxSamples = 10; + protected int m_MaxSamples = 10; - protected LinkedList Data = new LinkedList(); + protected LinkedList m_Data = new LinkedList(); private bool m_IsDirty = true; - protected float LastCount; - protected float LastTime; + protected float m_LastCount; + protected float m_LastTime; public virtual void Record(int amt = 1) { m_IsDirty = true; - var t_now = Time.time; + var timeNow = Time.time; // 'Record' can get called many times in the same frame (for the same exact timestamp) // This not only blows out the samples but makes the rate computation break since we // have n samples with a time delta of zero. // // Instead, if we want to record a value at the same exact time as our last // sample, just adjust that sample - if (Data.First != null && Data.First.Value.TimeRecorded == t_now) + if (m_Data.First != null && m_Data.First.Value.TimeRecorded == timeNow) { - Data.First.Value = new Sample() + m_Data.First.Value = new Sample() { - Count = Data.First.Value.Count + amt, - TimeRecorded = Data.First.Value.TimeRecorded + Count = m_Data.First.Value.Count + amt, + TimeRecorded = m_Data.First.Value.TimeRecorded }; } else { - Data.AddFirst(new Sample() { Count = amt, TimeRecorded = Time.time }); - while (Data.Count > MaxSamples) + m_Data.AddFirst(new Sample() { Count = amt, TimeRecorded = Time.time }); + while (m_Data.Count > m_MaxSamples) { - Data.RemoveLast(); + m_Data.RemoveLast(); } } } @@ -59,26 +59,26 @@ public virtual float SampleRate() { if (m_IsDirty) { - LinkedListNode node = Data.First; - LastCount = 0; - LastTime = Data.Last?.Value.TimeRecorded ?? 0.0f; + LinkedListNode node = m_Data.First; + m_LastCount = 0; + m_LastTime = m_Data.Last?.Value.TimeRecorded ?? 0.0f; while (node != null) { - LastCount += node.Value.Count; + m_LastCount += node.Value.Count; node = node.Next; } m_IsDirty = false; } - float delta = Time.time - LastTime; + float delta = Time.time - m_LastTime; if (delta == 0.0f) { return 0.0f; } - return LastCount / delta; + return m_LastCount / delta; } } @@ -90,10 +90,10 @@ public ProfilerIncStat(string name) : base(name) { } public override void Record(int amt = 1) { - Data.AddFirst(new Sample() { Count = amt, TimeRecorded = Time.time }); - while (Data.Count > MaxSamples) + m_Data.AddFirst(new Sample() { Count = amt, TimeRecorded = Time.time }); + while (m_Data.Count > m_MaxSamples) { - Data.RemoveLast(); + m_Data.RemoveLast(); } m_InternalValue += amt; diff --git a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs b/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs index ac5c08f421..45872ebad1 100644 --- a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs @@ -236,7 +236,7 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid) // Justification: Rare alloc, could(should?) reuse var newSceneObjects = new List(); { - var networkObjects = MonoBehaviour.FindObjectsOfType(); + var networkObjects = UnityEngine.Object.FindObjectsOfType(); for (int i = 0; i < networkObjects.Length; i++) { if (networkObjects[i].IsSceneObject == null) @@ -260,7 +260,7 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid) uint sceneObjectsToSpawn = 0; for (int i = 0; i < newSceneObjects.Count; i++) { - if (newSceneObjects[i].m_Observers.Contains(NetworkManager.Singleton.ConnectedClientsList[j].ClientId)) + if (newSceneObjects[i].Observers.Contains(NetworkManager.Singleton.ConnectedClientsList[j].ClientId)) { sceneObjectsToSpawn++; } @@ -270,7 +270,7 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid) for (int i = 0; i < newSceneObjects.Count; i++) { - if (newSceneObjects[i].m_Observers.Contains(NetworkManager.Singleton.ConnectedClientsList[j].ClientId)) + if (newSceneObjects[i].Observers.Contains(NetworkManager.Singleton.ConnectedClientsList[j].ClientId)) { writer.WriteBool(newSceneObjects[i].IsPlayerObject); writer.WriteUInt64Packed(newSceneObjects[i].NetworkObjectId); @@ -386,7 +386,7 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea } else { - var networkObjects = MonoBehaviour.FindObjectsOfType(); + var networkObjects = UnityEngine.Object.FindObjectsOfType(); NetworkSpawnManager.ClientCollectSoftSyncSceneObjectSweep(networkObjects); using (var reader = PooledNetworkReader.Get(objectStream)) @@ -480,7 +480,7 @@ private static void MoveObjectsToDontDestroyOnLoad() sobj.gameObject.transform.parent = null; } - MonoBehaviour.DontDestroyOnLoad(sobj.gameObject); + UnityEngine.Object.DontDestroyOnLoad(sobj.gameObject); } } diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs index 24343141cc..a6089a445b 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs @@ -1049,32 +1049,35 @@ public ArraySegment CreateArraySegment(int sizeToCopy = -1, int offset = - if (m_NetworkSource != null) { //If no offset was passed, used the current position - int Offset = offset == -1 ? (int)m_NetworkSource.Position : offset; - int CopySize = sizeToCopy == -1 && offset == -1 ? (int)m_NetworkSource.Length : sizeToCopy; - if (CopySize > 0) + bool noOffset = offset == -1; + bool noSizeToCopy = sizeToCopy == -1; + + offset = noOffset ? (int)m_NetworkSource.Position : offset; + sizeToCopy = noSizeToCopy && noOffset ? (int)m_NetworkSource.Length : sizeToCopy; + if (sizeToCopy > 0) { //Check to make sure we won't be copying beyond our bounds - if ((m_NetworkSource.Length - Offset) >= CopySize) + if ((m_NetworkSource.Length - offset) >= sizeToCopy) { - return new ArraySegment(m_NetworkSource.GetBuffer(), Offset, CopySize); + return new ArraySegment(m_NetworkSource.GetBuffer(), offset, sizeToCopy); } //If we didn't pass anything in or passed the length of the buffer - if (CopySize == m_NetworkSource.Length) + if (sizeToCopy == m_NetworkSource.Length) { - Offset = 0; + offset = 0; } else { - Debug.LogError($"{nameof(CopySize)} ({CopySize}) exceeds bounds with an {nameof(Offset)} of ({Offset})! "); + Debug.LogError($"{nameof(sizeToCopy)} ({sizeToCopy}) exceeds bounds with an {nameof(offset)} of ({offset})! "); return new ArraySegment(); } //Return the request array segment - return new ArraySegment(m_NetworkSource.GetBuffer(), Offset, CopySize); + return new ArraySegment(m_NetworkSource.GetBuffer(), offset, sizeToCopy); } - Debug.LogError($"{nameof(CopySize)} ({CopySize}) is zero or less! "); + Debug.LogError($"{nameof(sizeToCopy)} ({sizeToCopy}) is zero or less! "); } else { diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs index 075e134c23..a355a68df4 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs @@ -968,33 +968,31 @@ public void WriteByteArray(byte[] b, long count = -1) /// public void WriteBytes(byte[] buffer, long targetSize, int offset = 0) { - long TargetSize = targetSize; - long LargeInt64Blocks = TargetSize >> 3; //Divide by 8 - int IndexOffset = offset; + long largeInt64Blocks = targetSize >> 3; //Divide by 8 //8 Byte blocks - for (long i = 0; i < LargeInt64Blocks; i++) + for (long i = 0; i < largeInt64Blocks; i++) { - WriteInt64(BitConverter.ToInt64(buffer, IndexOffset)); - IndexOffset += 8; + WriteInt64(BitConverter.ToInt64(buffer, offset)); + offset += 8; } - long Offset = LargeInt64Blocks * 8; - long Remainder = TargetSize - Offset; + long blockOffset = largeInt64Blocks * 8; + long remainder = targetSize - blockOffset; //4 byte block - if (Remainder >= 4) + if (remainder >= 4) { - WriteInt32(BitConverter.ToInt32(buffer, IndexOffset)); - IndexOffset += 4; - Offset += 4; + WriteInt32(BitConverter.ToInt32(buffer, offset)); + offset += 4; + blockOffset += 4; } //Remainder of bytes < 4 - if (TargetSize - Offset > 0) + if (targetSize - blockOffset > 0) { - for (long i = 0; i < (TargetSize - Offset); i++) + for (long i = 0; i < (targetSize - blockOffset); i++) { - WriteByte(buffer[IndexOffset + i]); + WriteByte(buffer[offset + i]); } } } @@ -1014,29 +1012,28 @@ public void WriteBytes(byte[] buffer, long targetSize, int offset = 0) /// public void ReadAndWrite(NetworkReader sourceReader, long targetSize) { - long TargetSize = targetSize; - long LargeInt64Blocks = TargetSize >> 3; //Divide by 8 + long largeInt64Blocks = targetSize >> 3; //Divide by 8 //8 Byte blocks - for (long i = 0; i < LargeInt64Blocks; i++) + for (long i = 0; i < largeInt64Blocks; i++) { WriteInt64(sourceReader.ReadInt64()); } - long Offset = LargeInt64Blocks * 8; - long Remainder = TargetSize - Offset; + long offset = largeInt64Blocks * 8; + long remainder = targetSize - offset; //4 byte block - if (Remainder >= 4) + if (remainder >= 4) { WriteInt32(sourceReader.ReadInt32()); - Offset += 4; + offset += 4; } //Remainder of bytes < 4 - if (TargetSize - Offset > 0) + if (targetSize - offset > 0) { - for (long i = 0; i < (TargetSize - Offset); i++) + for (long i = 0; i < (targetSize - offset); i++) { WriteByte(sourceReader.ReadByteDirect()); } diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs index a01d09530f..063cc540a0 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs @@ -7,7 +7,7 @@ namespace MLAPI.Serialization.Pooled /// public sealed class PooledNetworkBuffer : NetworkBuffer, IDisposable { - private bool isDisposed = false; + private bool m_IsDisposed = false; internal PooledNetworkBuffer() { } @@ -18,7 +18,7 @@ internal PooledNetworkBuffer() { } public static PooledNetworkBuffer Get() { var buffer = NetworkBufferPool.GetBuffer(); - buffer.isDisposed = false; + buffer.m_IsDisposed = false; return buffer; } @@ -27,9 +27,9 @@ public static PooledNetworkBuffer Get() /// public new void Dispose() { - if (!isDisposed) + if (!m_IsDisposed) { - isDisposed = true; + m_IsDisposed = true; NetworkBufferPool.PutBackInPool(this); } } diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs index 10b3d4a1f7..ed6f6a2f4b 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs @@ -280,7 +280,7 @@ internal static NetworkObject CreateLocalNetworkObject(bool softCreate, ulong in if (NetworkSceneManager.IsSpawnedObjectsPendingInDontDestroyOnLoad) { - GameObject.DontDestroyOnLoad(networkObject.gameObject); + UnityEngine.Object.DontDestroyOnLoad(networkObject.gameObject); } return networkObject; @@ -300,7 +300,7 @@ internal static NetworkObject CreateLocalNetworkObject(bool softCreate, ulong in } var prefab = NetworkManager.Singleton.NetworkConfig.NetworkPrefabs[prefabIndex].Prefab; - var networkObject = ((position == null && rotation == null) ? MonoBehaviour.Instantiate(prefab) : MonoBehaviour.Instantiate(prefab, position.GetValueOrDefault(Vector3.zero), rotation.GetValueOrDefault(Quaternion.identity))).GetComponent(); + var networkObject = ((position == null && rotation == null) ? UnityEngine.Object.Instantiate(prefab) : UnityEngine.Object.Instantiate(prefab, position.GetValueOrDefault(Vector3.zero), rotation.GetValueOrDefault(Quaternion.identity))).GetComponent(); if (parentNetworkObject != null) { @@ -309,7 +309,7 @@ internal static NetworkObject CreateLocalNetworkObject(bool softCreate, ulong in if (NetworkSceneManager.IsSpawnedObjectsPendingInDontDestroyOnLoad) { - GameObject.DontDestroyOnLoad(networkObject.gameObject); + UnityEngine.Object.DontDestroyOnLoad(networkObject.gameObject); } return networkObject; @@ -401,7 +401,7 @@ internal static void SpawnNetworkObjectLocally(NetworkObject networkObject, ulon { if (networkObject.CheckObjectVisibility == null || networkObject.CheckObjectVisibility(NetworkManager.Singleton.ConnectedClientsList[i].ClientId)) { - networkObject.m_Observers.Add(NetworkManager.Singleton.ConnectedClientsList[i].ClientId); + networkObject.Observers.Add(NetworkManager.Singleton.ConnectedClientsList[i].ClientId); } } } @@ -580,7 +580,7 @@ internal static void ServerDestroySpawnedSceneObjects() else { SpawnedObjectsList.Remove(sobj); - MonoBehaviour.Destroy(sobj.gameObject); + UnityEngine.Object.Destroy(sobj.gameObject); } } } @@ -588,7 +588,7 @@ internal static void ServerDestroySpawnedSceneObjects() internal static void DestroyNonSceneObjects() { - var networkObjects = MonoBehaviour.FindObjectsOfType(); + var networkObjects = UnityEngine.Object.FindObjectsOfType(); for (int i = 0; i < networkObjects.Length; i++) { @@ -601,7 +601,7 @@ internal static void DestroyNonSceneObjects() } else { - MonoBehaviour.Destroy(networkObjects[i].gameObject); + UnityEngine.Object.Destroy(networkObjects[i].gameObject); } } } @@ -609,7 +609,7 @@ internal static void DestroyNonSceneObjects() internal static void DestroySceneObjects() { - var networkObjects = MonoBehaviour.FindObjectsOfType(); + var networkObjects = UnityEngine.Object.FindObjectsOfType(); for (int i = 0; i < networkObjects.Length; i++) { @@ -622,7 +622,7 @@ internal static void DestroySceneObjects() } else { - MonoBehaviour.Destroy(networkObjects[i].gameObject); + UnityEngine.Object.Destroy(networkObjects[i].gameObject); } } } @@ -642,14 +642,14 @@ internal static void CleanDiffedSceneObjects() for (int i = 0; i < networkObjectsToDestroy.Count; i++) { - MonoBehaviour.Destroy(networkObjectsToDestroy[i].gameObject); + UnityEngine.Object.Destroy(networkObjectsToDestroy[i].gameObject); } } } internal static void ServerSpawnSceneObjectsOnStartSweep() { - var networkObjects = MonoBehaviour.FindObjectsOfType(); + var networkObjects = UnityEngine.Object.FindObjectsOfType(); for (int i = 0; i < networkObjects.Length; i++) { @@ -664,7 +664,7 @@ internal static void ClientCollectSoftSyncSceneObjectSweep(NetworkObject[] netwo { if (networkObjects == null) { - networkObjects = MonoBehaviour.FindObjectsOfType(); + networkObjects = UnityEngine.Object.FindObjectsOfType(); } for (int i = 0; i < networkObjects.Length; i++) @@ -758,7 +758,7 @@ internal static void OnDestroyObject(ulong networkId, bool destroyGameObject) } else { - MonoBehaviour.Destroy(gobj); + UnityEngine.Object.Destroy(gobj); } } diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs index 166b48e6a7..dde904bfaf 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs @@ -85,7 +85,9 @@ public TransportChannel[] MLAPI_CHANNELS /// /// The channels the MLAPI will use when sending internal messages. /// +#pragma warning disable IDE1006 private readonly TransportChannel[] MLAPI_INTERNAL_CHANNELS = +#pragma warning restore IDE1006 { new TransportChannel(NetworkChannel.Internal, NetworkDelivery.ReliableFragmentedSequenced), new TransportChannel(NetworkChannel.ReliableRpc, NetworkDelivery.ReliableSequenced), diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs index d0bc6d706e..12d252e64c 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs @@ -35,10 +35,10 @@ public void UNetCustomChannelRegistrationTest() ut.ServerListenPort = 7777; nm.NetworkConfig.NetworkTransport = ut; - byte CustomChannel = 0; + byte customChannel = 0; // test 1: add a legit channel. - ut.Channels.Add(new UNetChannel { Id = NetworkChannel.ChannelUnused + CustomChannel, Type = QosType.Unreliable }); + ut.Channels.Add(new UNetChannel { Id = NetworkChannel.ChannelUnused + customChannel, Type = QosType.Unreliable }); try { diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs index 6dbc01b059..6cbb7341fd 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs @@ -267,7 +267,7 @@ public static int AddWebsocketHost(HostTopology topology, int port, string ip, b return ret; } - private static readonly byte[] disconnectBuffer = new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, (byte)MessageType.ClientDisconnect }; + private static byte[] s_DisconnectBuffer = { 0, 0, 0, 0, 0, 0, 0, 0, (byte)MessageType.ClientDisconnect }; public static bool Disconnect(int hostId, int connectionId, out byte error) { @@ -280,10 +280,10 @@ public static bool Disconnect(int hostId, int connectionId, out byte error) { for (byte i = 0; i < sizeof(ulong); i++) { - disconnectBuffer[i] = ((byte)((ulong)connectionId >> (i * 8))); + s_DisconnectBuffer[i] = ((byte)((ulong)connectionId >> (i * 8))); } - return UnityEngine.Networking.NetworkTransport.Send(hostId, s_RelayConnectionId, s_DefaultChannelId, disconnectBuffer, 9, out error); + return UnityEngine.Networking.NetworkTransport.Send(hostId, s_RelayConnectionId, s_DefaultChannelId, s_DisconnectBuffer, 9, out error); } return UnityEngine.Networking.NetworkTransport.Disconnect(hostId, connectionId, out error); @@ -407,7 +407,7 @@ private static NetworkEventType BaseReceive(NetworkEventType netEvent, int hostI { if (!s_IsClient) { - ulong _connectionId = (((ulong)buffer[receivedSize - 9]) | + ulong connIdFromBuffer = (((ulong)buffer[receivedSize - 9]) | ((ulong)buffer[receivedSize - 8] << 8) | ((ulong)buffer[receivedSize - 7] << 16) | ((ulong)buffer[receivedSize - 6] << 24) | @@ -416,7 +416,7 @@ private static NetworkEventType BaseReceive(NetworkEventType netEvent, int hostI ((ulong)buffer[receivedSize - 3] << 48) | ((ulong)buffer[receivedSize - 2] << 56)); - connectionId = (int)_connectionId; + connectionId = (int)connIdFromBuffer; } return NetworkEventType.ConnectEvent; @@ -432,7 +432,7 @@ private static NetworkEventType BaseReceive(NetworkEventType netEvent, int hostI { receivedSize -= 9; - ulong _connectionId = (((ulong)buffer[receivedSize]) | + ulong connIdFromBuffer = (((ulong)buffer[receivedSize]) | ((ulong)buffer[receivedSize + 1] << 8) | ((ulong)buffer[receivedSize + 2] << 16) | ((ulong)buffer[receivedSize + 3] << 24) | @@ -441,14 +441,14 @@ private static NetworkEventType BaseReceive(NetworkEventType netEvent, int hostI ((ulong)buffer[receivedSize + 6] << 48) | ((ulong)buffer[receivedSize + 7] << 56)); - connectionId = (int)_connectionId; + connectionId = (int)connIdFromBuffer; } return NetworkEventType.DataEvent; } case MessageType.ClientDisconnect: { - ulong _connectionId = (((ulong)buffer[0]) | + ulong connIdFromBuffer = (((ulong)buffer[0]) | ((ulong)buffer[1] << 8) | ((ulong)buffer[2] << 16) | ((ulong)buffer[3] << 24) | @@ -457,7 +457,7 @@ private static NetworkEventType BaseReceive(NetworkEventType netEvent, int hostI ((ulong)buffer[6] << 48) | ((ulong)buffer[7] << 56)); - connectionId = (int)_connectionId; + connectionId = (int)connIdFromBuffer; return NetworkEventType.DisconnectEvent; } diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs index 77e0cee67e..52e3bb3d5f 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using MLAPI.Profiling; using NUnit.Framework; -using UnityEditor; namespace MLAPI.RuntimeTests { @@ -13,16 +12,16 @@ internal static class ProfilerConstants public const string TransportTestData = nameof(TransportTestData); } - private static readonly ProfilingDataStore TransportProfilerData = new ProfilingDataStore(); + private static ProfilingDataStore s_TransportProfilerData = new ProfilingDataStore(); public void BeginNewTick() { - TransportProfilerData.Clear(); + s_TransportProfilerData.Clear(); } public IReadOnlyDictionary GetTransportProfilerData() { - return TransportProfilerData.GetReadonly(); + return s_TransportProfilerData.GetReadonly(); } public void Send(string testMessage) diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/BufferDataValidationComponent.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/BufferDataValidationComponent.cs index c2ad7e31ab..58f2bafb08 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/BufferDataValidationComponent.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/BufferDataValidationComponent.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using UnityEngine; using MLAPI.Messaging; @@ -48,7 +47,7 @@ private void Start() m_PreCalculatedBufferValues = new List(MaximumBufferSize + 1); while (m_PreCalculatedBufferValues.Count <= MaximumBufferSize) { - m_PreCalculatedBufferValues.Add((byte)UnityEngine.Random.Range(0, 255)); + m_PreCalculatedBufferValues.Add((byte)Random.Range(0, 255)); } } diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkManagerHelper.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkManagerHelper.cs index 1984031f85..d44ebed2d1 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkManagerHelper.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkManagerHelper.cs @@ -21,14 +21,12 @@ namespace MLAPI.RuntimeTests /// public static class NetworkManagerHelper { - public static Transports.Tasks.SocketTasks s_StartHostSocketTasks { get; internal set; } - public static GameObject s_NetworkManagerObject { get; internal set; } + public static Transports.Tasks.SocketTasks StartHostSocketTasks { get; internal set; } + public static GameObject NetworkManagerObject { get; internal set; } - internal static Dictionary s_InstantiatedGameObjects = new Dictionary(); - - internal static Dictionary s_InstantiatedNetworkObjects = new Dictionary(); - - internal static NetworkManagerOperatingMode s_CurrentNetworkManagerMode; + internal static Dictionary InstantiatedGameObjects = new Dictionary(); + internal static Dictionary InstantiatedNetworkObjects = new Dictionary(); + internal static NetworkManagerOperatingMode CurrentNetworkManagerMode; /// /// This provides the ability to start NetworkManager in various modes @@ -53,15 +51,15 @@ public enum NetworkManagerOperatingMode public static bool StartNetworkManager(NetworkManagerOperatingMode managerMode = NetworkManagerOperatingMode.Host) { //If we are changing the current manager mode and the current manager mode is not "None", then stop the NetworkManager mode - if (s_CurrentNetworkManagerMode != managerMode && s_CurrentNetworkManagerMode != NetworkManagerOperatingMode.None) + if (CurrentNetworkManagerMode != managerMode && CurrentNetworkManagerMode != NetworkManagerOperatingMode.None) { StopNetworkManagerMode(); } if (NetworkManager.Singleton == null) { - s_NetworkManagerObject = new GameObject(nameof(NetworkManager)); - var networkManagerComponent = s_NetworkManagerObject.AddComponent(); + NetworkManagerObject = new GameObject(nameof(NetworkManager)); + var networkManagerComponent = NetworkManagerObject.AddComponent(); if (networkManagerComponent == null) { return false; @@ -69,7 +67,7 @@ public static bool StartNetworkManager(NetworkManagerOperatingMode managerMode = Debug.Log($"{nameof(NetworkManager)} Instantiated."); - var unetTransport = s_NetworkManagerObject.AddComponent(); + var unetTransport = NetworkManagerObject.AddComponent(); networkManagerComponent.NetworkConfig = new Configuration.NetworkConfig { @@ -114,11 +112,11 @@ public static Guid AddGameNetworkObject(string nameOfGameObject) Assert.IsNotNull(networkObject); - Assert.IsFalse(s_InstantiatedGameObjects.ContainsKey(gameObjectId)); - Assert.IsFalse(s_InstantiatedNetworkObjects.ContainsKey(gameObjectId)); + Assert.IsFalse(InstantiatedGameObjects.ContainsKey(gameObjectId)); + Assert.IsFalse(InstantiatedNetworkObjects.ContainsKey(gameObjectId)); - s_InstantiatedGameObjects.Add(gameObjectId, gameObject); - s_InstantiatedNetworkObjects.Add(gameObjectId, networkObject); + InstantiatedGameObjects.Add(gameObjectId, gameObject); + InstantiatedNetworkObjects.Add(gameObjectId, networkObject); return gameObjectId; } @@ -131,8 +129,8 @@ public static Guid AddGameNetworkObject(string nameOfGameObject) /// public static T AddComponentToObject(Guid gameObjectIdentifier) where T : NetworkBehaviour { - Assert.IsTrue(s_InstantiatedGameObjects.ContainsKey(gameObjectIdentifier)); - return s_InstantiatedGameObjects[gameObjectIdentifier].AddComponent(); + Assert.IsTrue(InstantiatedGameObjects.ContainsKey(gameObjectIdentifier)); + return InstantiatedGameObjects[gameObjectIdentifier].AddComponent(); } /// @@ -141,10 +139,10 @@ public static T AddComponentToObject(Guid gameObjectIdentifier) where T : Net /// ID returned to reference the game object public static void SpawnNetworkObject(Guid gameObjectIdentifier) { - Assert.IsTrue(s_InstantiatedNetworkObjects.ContainsKey(gameObjectIdentifier)); - if (!s_InstantiatedNetworkObjects[gameObjectIdentifier].IsSpawned) + Assert.IsTrue(InstantiatedNetworkObjects.ContainsKey(gameObjectIdentifier)); + if (!InstantiatedNetworkObjects[gameObjectIdentifier].IsSpawned) { - s_InstantiatedNetworkObjects[gameObjectIdentifier].Spawn(); + InstantiatedNetworkObjects[gameObjectIdentifier].Spawn(); } } @@ -154,8 +152,8 @@ public static void SpawnNetworkObject(Guid gameObjectIdentifier) /// the mode to start the NetworkManager as private static void StartNetworkManagerMode(NetworkManagerOperatingMode managerMode) { - s_CurrentNetworkManagerMode = managerMode; - switch (s_CurrentNetworkManagerMode) + CurrentNetworkManagerMode = managerMode; + switch (CurrentNetworkManagerMode) { case NetworkManagerOperatingMode.Host: { @@ -176,7 +174,7 @@ private static void StartNetworkManagerMode(NetworkManagerOperatingMode managerM break; } } - Debug.Log($"{s_CurrentNetworkManagerMode} started."); + Debug.Log($"{CurrentNetworkManagerMode} started."); } /// @@ -184,7 +182,7 @@ private static void StartNetworkManagerMode(NetworkManagerOperatingMode managerM /// private static void StopNetworkManagerMode() { - switch (s_CurrentNetworkManagerMode) + switch (CurrentNetworkManagerMode) { case NetworkManagerOperatingMode.Host: { @@ -206,22 +204,22 @@ private static void StopNetworkManagerMode() } } - Debug.Log($"{s_CurrentNetworkManagerMode} stopped."); - s_CurrentNetworkManagerMode = NetworkManagerOperatingMode.None; + Debug.Log($"{CurrentNetworkManagerMode} stopped."); + CurrentNetworkManagerMode = NetworkManagerOperatingMode.None; } //This is called, even if we assert and exit early from a test public static void ShutdownNetworkManager() { //clean up any game objects created with custom unit testing components - foreach (var entry in s_InstantiatedGameObjects) + foreach (var entry in InstantiatedGameObjects) { - GameObject.Destroy(entry.Value); + UnityEngine.Object.Destroy(entry.Value); } - s_InstantiatedGameObjects.Clear(); + InstantiatedGameObjects.Clear(); - if (s_NetworkManagerObject != null) + if (NetworkManagerObject != null) { StopNetworkManagerMode(); @@ -230,7 +228,7 @@ public static void ShutdownNetworkManager() Debug.Log($"{nameof(NetworkManager)} shutdown."); - GameObject.Destroy(s_NetworkManagerObject); + UnityEngine.Object.Destroy(NetworkManagerObject); Debug.Log($"{nameof(NetworkManager)} destroyed."); } diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs index 4a9adbfdcd..68409ea507 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs @@ -432,7 +432,7 @@ public IEnumerator UpdateStagesMixed() Assert.AreEqual(kRunTotalFrames, netUpdates[kNetPreUpdateIndex]); Assert.AreEqual(netUpdates[kNetPreUpdateIndex], monoUpdates[kMonoUpdateIndex]); - GameObject.DestroyImmediate(gameObject); + UnityEngine.Object.DestroyImmediate(gameObject); } } } diff --git a/testproject/Assets/Scenes/SampleScene.unity b/testproject/Assets/Scenes/SampleScene.unity index f7d75e0d95..9f6cfbd6bd 100644 --- a/testproject/Assets/Scenes/SampleScene.unity +++ b/testproject/Assets/Scenes/SampleScene.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -98,8 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 14f16586073aeec42b2d9eda43bf9bcc, - type: 2} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -186,7 +183,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -211,7 +207,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &19899158 MeshFilter: m_ObjectHideFlags: 0 @@ -404,7 +399,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -429,7 +423,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &457860560 MeshFilter: m_ObjectHideFlags: 0 @@ -500,7 +493,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -525,7 +517,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &535968798 MeshFilter: m_ObjectHideFlags: 0 @@ -659,7 +650,6 @@ MonoBehaviour: ClientConnectionBufferTimeout: 10 ConnectionApproval: 0 ConnectionData: - SecondsHistory: 5 EnableTimeResync: 0 TimeResyncInterval: 30 EnableNetworkVariable: 1 @@ -853,7 +843,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &705507995 @@ -1080,7 +1069,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1105,7 +1093,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &878759705 MeshFilter: m_ObjectHideFlags: 0 @@ -1143,8 +1130,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4390d966eb8724ba2907f775b34e94ea, type: 3} m_Name: m_EditorClassIdentifier: - network: {fileID: 620561611} - buttonsUI: {fileID: 1333567162} + NetworkManager: {fileID: 620561611} + ButtonsUI: {fileID: 1333567162} --- !u!4 &1195940333 Transform: m_ObjectHideFlags: 0 @@ -1188,7 +1175,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 05037a80244af4174806bc7f242e4432, type: 3} m_Name: m_EditorClassIdentifier: - unityChanPrefab: {fileID: 442217489085244684, guid: 5eca8a21314fe4278ba2571c289a9773, + UnityChanPrefab: {fileID: 442217489085244684, guid: 5eca8a21314fe4278ba2571c289a9773, type: 3} --- !u!4 &1202924674 Transform: @@ -1262,7 +1249,6 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 --- !u!223 &1333567165 Canvas: m_ObjectHideFlags: 0 @@ -1366,7 +1352,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1391,7 +1376,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1398767345 MeshFilter: m_ObjectHideFlags: 0 @@ -1448,7 +1432,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1473,7 +1456,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1463459133 MeshFilter: m_ObjectHideFlags: 0 @@ -1558,7 +1540,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1583,7 +1564,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1469649189 MeshFilter: m_ObjectHideFlags: 0 @@ -1654,7 +1634,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1679,7 +1658,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1636734286 MeshFilter: m_ObjectHideFlags: 0 @@ -1783,7 +1761,6 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1808,7 +1785,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2036456031 MeshFilter: m_ObjectHideFlags: 0 @@ -1949,6 +1925,11 @@ PrefabInstance: propertyPath: m_Name value: ConnectionModeButtons objectReference: {fileID: 0} + - target: {fileID: 6963777608485144162, guid: 4a604aa67024b7d40912bb9a43751f74, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a604aa67024b7d40912bb9a43751f74, type: 3} --- !u!224 &2956145122835429430 stripped @@ -1957,3 +1938,9 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2956145122835429429} m_PrefabAsset: {fileID: 0} +--- !u!1 &2956145122835429431 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6963777608485144162, guid: 4a604aa67024b7d40912bb9a43751f74, + type: 3} + m_PrefabInstance: {fileID: 2956145122835429429} + m_PrefabAsset: {fileID: 0} diff --git a/testproject/Assets/Scripts/Raygun.cs b/testproject/Assets/Scripts/Raygun.cs index 6e9475a3a3..624aff69fe 100644 --- a/testproject/Assets/Scripts/Raygun.cs +++ b/testproject/Assets/Scripts/Raygun.cs @@ -4,7 +4,7 @@ public class Raygun : NetworkBehaviour { - public float m_Range = 10; + public float Range = 10; private GameObject m_CurrentTarget; private LineRenderer m_LineRenderer; @@ -19,7 +19,7 @@ private void Awake() private void FixedUpdate() { - var forward = transform.forward * m_Range; + var forward = transform.forward * Range; m_LineRenderer.positionCount = 2; m_LineRenderer.SetPosition(0, transform.position); diff --git a/testproject/Assets/Scripts/UIController.cs b/testproject/Assets/Scripts/UIController.cs index 0ad421a0d0..329d9023ca 100644 --- a/testproject/Assets/Scripts/UIController.cs +++ b/testproject/Assets/Scripts/UIController.cs @@ -3,29 +3,29 @@ public class UIController : MonoBehaviour { - public NetworkManager network; - public GameObject buttonsUI; + public NetworkManager NetworkManager; + public GameObject ButtonsUI; public void CreateServer() { - network.StartServer(); + NetworkManager.StartServer(); HideButtons(); } public void CreateHost() { - network.StartHost(); + NetworkManager.StartHost(); HideButtons(); } public void JoinGame() { - network.StartClient(); + NetworkManager.StartClient(); HideButtons(); } private void HideButtons() { - buttonsUI.SetActive(false); + ButtonsUI.SetActive(false); } } diff --git a/testproject/Assets/Scripts/UnityChanSpawner.cs b/testproject/Assets/Scripts/UnityChanSpawner.cs index 8138f63b8c..649996e647 100644 --- a/testproject/Assets/Scripts/UnityChanSpawner.cs +++ b/testproject/Assets/Scripts/UnityChanSpawner.cs @@ -3,13 +3,13 @@ public class UnityChanSpawner : MonoBehaviour { - public GameObject unityChanPrefab; + public GameObject UnityChanPrefab; private void Start() { NetworkManager.Singleton.OnServerStarted += () => { - var unityChanGameObj = Instantiate(unityChanPrefab); + var unityChanGameObj = Instantiate(UnityChanPrefab); var unityChanNetObj = unityChanGameObj.GetComponent(); unityChanNetObj.Spawn(); }; From e59244eddcf69c3b8941614f88da0f52981a92a1 Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Fri, 26 Mar 2021 14:54:42 +0000 Subject: [PATCH 3/8] add another template naming example --- .editorconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/.editorconfig b/.editorconfig index 9503bed7e2..d464cb0b93 100644 --- a/.editorconfig +++ b/.editorconfig @@ -56,6 +56,7 @@ dotnet_naming_rule.interface_naming_rule.style = interface_naming_style dotnet_naming_rule.interface_naming_rule.severity = error # class NetworkVariable +# class NetworkDictionary dotnet_naming_symbols.typeparam_naming_symbols.applicable_kinds = type_parameter dotnet_naming_symbols.typeparam_naming_symbols.applicable_accessibilities = public, internal dotnet_naming_style.typeparam_naming_style.required_prefix = T From 1b3d4984e4a5b3b40eb78bad19574c23480820cd Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Fri, 26 Mar 2021 16:51:14 +0000 Subject: [PATCH 4/8] make RpcQueueContainer private --- .../Messaging/RpcQueue/RpcQueueProcessor.cs | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueProcessor.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueProcessor.cs index 2b94b87f60..0025e8cc65 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueProcessor.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueProcessor.cs @@ -28,7 +28,7 @@ internal class RpcQueueProcessor private readonly List m_InternalMLAPISendQueue = new List(); //The RpcQueueContainer that is associated with this RpcQueueProcessor - internal RpcQueueContainer RpcQueueContainer; + private RpcQueueContainer m_RpcQueueContainer; /// /// ProcessReceiveQueue @@ -37,13 +37,13 @@ internal class RpcQueueProcessor public void ProcessReceiveQueue(NetworkUpdateStage currentStage, bool isTesting) { bool advanceFrameHistory = false; - if (!ReferenceEquals(RpcQueueContainer, null)) + if (!ReferenceEquals(m_RpcQueueContainer, null)) { #if DEVELOPMENT_BUILD || UNITY_EDITOR s_ProcessReceiveQueue.Begin(); #endif - var currentFrame = RpcQueueContainer.GetQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrameType.Inbound, currentStage); - var nextFrame = RpcQueueContainer.GetQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrameType.Inbound, currentStage, true); + var currentFrame = m_RpcQueueContainer.GetQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrameType.Inbound, currentStage); + var nextFrame = m_RpcQueueContainer.GetQueueHistoryFrame(RpcQueueHistoryFrame.QueueFrameType.Inbound, currentStage, true); if (nextFrame.IsDirty && nextFrame.HasLoopbackData) { advanceFrameHistory = true; @@ -72,7 +72,7 @@ public void ProcessReceiveQueue(NetworkUpdateStage currentStage, bool isTesting) if (advanceFrameHistory) { - RpcQueueContainer.AdvanceFrameHistory(RpcQueueHistoryFrame.QueueFrameType.Inbound); + m_RpcQueueContainer.AdvanceFrameHistory(RpcQueueHistoryFrame.QueueFrameType.Inbound); } #if DEVELOPMENT_BUILD || UNITY_EDITOR @@ -171,16 +171,16 @@ internal void InternalMessagesSendAndFlush(bool isListening) private void RpcQueueSendAndFlush(bool isListening) { var advanceFrameHistory = false; - if (!ReferenceEquals(RpcQueueContainer, null)) + if (!ReferenceEquals(m_RpcQueueContainer, null)) { - var currentFrame = RpcQueueContainer.GetCurrentFrame(RpcQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate); + var currentFrame = m_RpcQueueContainer.GetCurrentFrame(RpcQueueHistoryFrame.QueueFrameType.Outbound, NetworkUpdateStage.PostLateUpdate); if (currentFrame != null) { var currentQueueItem = currentFrame.GetFirstQueueItem(); while (currentQueueItem.QueueItemType != RpcQueueContainer.QueueItemType.None) { advanceFrameHistory = true; - if (RpcQueueContainer.IsUsingBatching()) + if (m_RpcQueueContainer.IsUsingBatching()) { m_RpcBatcher.QueueItem(currentQueueItem); @@ -201,7 +201,7 @@ private void RpcQueueSendAndFlush(bool isListening) } //If the size is < m_BatchThreshold then just send the messages - if (advanceFrameHistory && RpcQueueContainer.IsUsingBatching()) + if (advanceFrameHistory && m_RpcQueueContainer.IsUsingBatching()) { m_RpcBatcher.SendItems(0, SendCallback); } @@ -210,7 +210,7 @@ private void RpcQueueSendAndFlush(bool isListening) //If we processed any RPCs, then advance to the next frame if (advanceFrameHistory) { - RpcQueueContainer.AdvanceFrameHistory(RpcQueueHistoryFrame.QueueFrameType.Outbound); + m_RpcQueueContainer.AdvanceFrameHistory(RpcQueueHistoryFrame.QueueFrameType.Outbound); } } } @@ -226,7 +226,7 @@ private void SendCallback(ulong clientId, RpcBatcher.SendStream sendStream) var bytes = sendStream.Buffer.GetBuffer(); var sendBuffer = new ArraySegment(bytes, 0, length); - RpcQueueContainer.NetworkManager.NetworkConfig.NetworkTransport.Send(clientId, sendBuffer, sendStream.NetworkChannel); + m_RpcQueueContainer.NetworkManager.NetworkConfig.NetworkTransport.Send(clientId, sendBuffer, sendStream.NetworkChannel); } /// @@ -240,7 +240,7 @@ private void SendFrameQueueItem(RpcFrameQueueItem queueItem) { case RpcQueueContainer.QueueItemType.ServerRpc: { - RpcQueueContainer.NetworkManager.NetworkConfig.NetworkTransport.Send(queueItem.NetworkId, queueItem.MessageData, queueItem.NetworkChannel); + m_RpcQueueContainer.NetworkManager.NetworkConfig.NetworkTransport.Send(queueItem.NetworkId, queueItem.MessageData, queueItem.NetworkChannel); //For each packet sent, we want to record how much data we have sent @@ -254,7 +254,7 @@ private void SendFrameQueueItem(RpcFrameQueueItem queueItem) { foreach (ulong clientid in queueItem.ClientNetworkIds) { - RpcQueueContainer.NetworkManager.NetworkConfig.NetworkTransport.Send(clientid, queueItem.MessageData, queueItem.NetworkChannel); + m_RpcQueueContainer.NetworkManager.NetworkConfig.NetworkTransport.Send(clientid, queueItem.MessageData, queueItem.NetworkChannel); //For each packet sent, we want to record how much data we have sent PerformanceDataManager.Increment(ProfilerConstants.ByteSent, (int)queueItem.StreamSize); @@ -272,7 +272,7 @@ private void SendFrameQueueItem(RpcFrameQueueItem queueItem) internal RpcQueueProcessor(RpcQueueContainer rpcQueueContainer) { - RpcQueueContainer = rpcQueueContainer; + m_RpcQueueContainer = rpcQueueContainer; } } } From c14a7ed72b837f80192c9db416b4da707598c839 Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Fri, 26 Mar 2021 18:52:49 +0000 Subject: [PATCH 5/8] fix profiler-related namings --- .editorconfig | 1 - .../CodeGen/RuntimeAccessModifiersILPP.cs | 16 ++++- .../Editor/MLAPIProfilerModule.cs | 61 +++++++++++-------- .../Runtime/Messaging/RpcParams.cs | 2 + .../Profiling/ProfilerCounterUtility.cs | 1 + .../Runtime/Profiling/ProfilerCounterValue.cs | 5 +- .../Runtime/Profiling/ProfilerCountersInfo.cs | 1 + 7 files changed, 56 insertions(+), 31 deletions(-) diff --git a/.editorconfig b/.editorconfig index d464cb0b93..0389df482f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,7 +14,6 @@ indent_size = 4 # formatting rules dotnet_diagnostic.IDE0001.severity = error # Simplify name dotnet_diagnostic.IDE0002.severity = error # Simplify member access -dotnet_diagnostic.IDE0005.severity = error # Remove unnecessary import dotnet_style_qualification_for_field = false:error dotnet_style_qualification_for_property = false:error dotnet_style_qualification_for_method = false:error diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs index 020ba433ee..2ba7b3a5cc 100644 --- a/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs +++ b/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs @@ -20,7 +20,11 @@ internal sealed class RuntimeAccessModifiersILPP : ILPPInterface public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly) { - if (!WillProcess(compiledAssembly)) return null; + if (!WillProcess(compiledAssembly)) + { + return null; + } + m_Diagnostics.Clear(); // read @@ -37,7 +41,10 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly) { foreach (var typeDefinition in mainModule.Types) { - if (!typeDefinition.IsClass) continue; + if (!typeDefinition.IsClass) + { + continue; + } switch (typeDefinition.Name) { @@ -53,7 +60,10 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly) } } } - else m_Diagnostics.AddError($"Cannot get main module from MLAPI Runtime assembly definition: {compiledAssembly.Name}"); + else + { + m_Diagnostics.AddError($"Cannot get main module from MLAPI Runtime assembly definition: {compiledAssembly.Name}"); + } // write var pe = new MemoryStream(); diff --git a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs index c58744ea8c..278b43648b 100644 --- a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs +++ b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs @@ -1,3 +1,10 @@ +#if UNITY_2020_2_OR_NEWER +using System; +using System.Collections.Generic; +using Unity.Profiling; +using UnityEngine; +using MLAPI.Profiling; +#endif using UnityEditor; namespace MLAPI @@ -17,8 +24,8 @@ internal static class MLAPIProfilerModule private class MLAPIProfilerCounter { // Note: These fields are named this way for internal serialization - public string m_Name; - public string m_Category; + public string Name; + public string Category; } /// @@ -28,59 +35,61 @@ private class MLAPIProfilerCounter private class MLAPIProfilerModuleData { // Note: These fields are named this way for internal serialization - public List m_ChartCounters = new List(); - public List m_DetailCounters = new List(); - public string m_Name; + public List ChartCounters = new List(); + public List DetailCounters = new List(); + public string Name; } [Serializable] private class MLAPIModules { // Note: These fields are named this way for internal serialization - public List m_Modules; + public List Modules; } private static List CreateRPCCounters() => new List() { - new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcSent, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcReceived, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcBatchesSent, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcBatchesReceived, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcQueueProcessed, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcInQueueSize, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcOutQueueSize, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.RpcSent, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.RpcReceived, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.RpcBatchesSent, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.RpcBatchesReceived, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.RpcQueueProcessed, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.RpcInQueueSize, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.RpcOutQueueSize, Category = ProfilerCategory.Network.Name }, }; private static List CreateOperationsCounters() => new List() { - new MLAPIProfilerCounter { m_Name = ProfilerConstants.Connections, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.ReceiveTickRate, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.Connections, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.ReceiveTickRate, Category = ProfilerCategory.Network.Name }, }; private static List CreateMessagesCounters() => new List() { - new MLAPIProfilerCounter { m_Name = ProfilerConstants.NamedMessageReceived, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.UnnamedMessageReceived, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.NamedMessageSent, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.UnnamedMessageSent, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.ByteSent, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.ByteReceived, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.NetworkVarUpdates, m_Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { m_Name = ProfilerConstants.NetworkVarDeltas, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.NamedMessageReceived, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.UnnamedMessageReceived, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.NamedMessageSent, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.UnnamedMessageSent, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.ByteSent, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.ByteReceived, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.NetworkVarUpdates, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { Name = ProfilerConstants.NetworkVarDeltas, Category = ProfilerCategory.Network.Name }, }; private delegate List CounterListFactoryDelegate(); private static bool CreateMLAPIDynamicModule(ref MLAPIModules mlapiModules, string moduleName, CounterListFactoryDelegate counterListFactoryDelegate) { - var module = mlapiModules.m_Modules.Find(x => x.m_Name == moduleName); + var module = mlapiModules.Modules.Find(x => x.Name == moduleName); if (module == null) { var newModule = new MLAPIProfilerModuleData { - m_Name = moduleName, m_ChartCounters = counterListFactoryDelegate(), m_DetailCounters = counterListFactoryDelegate(), + Name = moduleName, + ChartCounters = counterListFactoryDelegate(), + DetailCounters = counterListFactoryDelegate(), }; - mlapiModules.m_Modules.Add(newModule); + mlapiModules.Modules.Add(newModule); return true; } diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs index 1e73b165ea..8f425df9a6 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs @@ -1,4 +1,6 @@ +#if !UNITY_2020_2_OR_NEWER using System; +#endif namespace MLAPI.Messaging { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs index b776b36a42..1d38faa595 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs @@ -1,4 +1,5 @@ #if UNITY_2020_2_OR_NEWER +using System; using Unity.Profiling.LowLevel; #endif diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs index 674f7219b3..a896003c0d 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs @@ -1,8 +1,11 @@ using System.Runtime.InteropServices; #if UNITY_2020_2_OR_NEWER +using System; +using System.Runtime.CompilerServices; using Unity.Profiling; using Unity.Profiling.LowLevel; using Unity.Profiling.LowLevel.Unsafe; +using Unity.Collections.LowLevel.Unsafe; #endif namespace MLAPI.Profiling @@ -18,7 +21,7 @@ namespace MLAPI.Profiling #if ENABLE_PROFILER [NativeDisableUnsafePtrRestriction] [NonSerialized] - readonly unsafe T* m_Value; + private readonly unsafe T* m_Value; #endif [MethodImpl(MethodImplOptions.AggressiveInlining)] diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs index 8fe3a3d76a..7bfe6262c0 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs @@ -1,4 +1,5 @@ #if UNITY_2020_2_OR_NEWER +using UnityEngine; using Unity.Profiling; #endif From 3c36a5fed0f6ab3ebb06a41f697ed2907f829d1b Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Mon, 29 Mar 2021 19:36:48 +0100 Subject: [PATCH 6/8] disable and comment naming rule violation checks --- .../Editor/MLAPIProfilerModule.cs | 2 ++ .../Runtime/Core/NetworkBehaviour.cs | 24 +++++++++---------- .../Runtime/Core/NetworkManager.cs | 4 ++-- .../Runtime/Messaging/RpcParams.cs | 4 ++-- .../Runtime/Transports/NetworkTransport.cs | 4 ++-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs index 278b43648b..b6a9dd96f0 100644 --- a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs +++ b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs @@ -17,6 +17,7 @@ internal static class MLAPIProfilerModule private const string k_OperationModuleName = "MLAPI Operations"; private const string k_MessageModuleName = "MLAPI Messages"; +#pragma warning disable IDE1006 // disable naming rule violation check /// /// This needs to be in synced with the internal dynamic module structure to provide our own counters /// @@ -46,6 +47,7 @@ private class MLAPIModules // Note: These fields are named this way for internal serialization public List Modules; } +#pragma warning restore IDE1006 // restore naming rule violation check private static List CreateRPCCounters() => new List() { diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs index 6651f48150..2ae85676ee 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs @@ -25,7 +25,7 @@ namespace MLAPI /// public abstract class NetworkBehaviour : MonoBehaviour { -#pragma warning disable IDE1006 +#pragma warning disable IDE1006 // disable naming rule violation check [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] #if UNITY_2020_2_OR_NEWER @@ -35,7 +35,7 @@ internal enum __NExec [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public enum __NExec #endif -#pragma warning restore IDE1006 +#pragma warning restore IDE1006 // restore naming rule violation check { None = 0, Server = 1, @@ -43,7 +43,7 @@ public enum __NExec } #pragma warning disable 414 -#pragma warning disable IDE1006 +#pragma warning disable IDE1006 // disable naming rule violation check [NonSerialized] [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] @@ -56,9 +56,9 @@ public enum __NExec public __NExec __nexec = __NExec.None; #endif #pragma warning restore 414 -#pragma warning restore IDE1006 +#pragma warning restore IDE1006 // restore naming rule violation check -#pragma warning disable IDE1006 +#pragma warning disable IDE1006 // disable naming rule violation check [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] #if UNITY_2020_2_OR_NEWER @@ -68,7 +68,7 @@ internal NetworkSerializer __beginSendServerRpc(ServerRpcParams serverRpcParams, [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public NetworkSerializer __beginSendServerRpc(ServerRpcParams serverRpcParams, RpcDelivery rpcDelivery) #endif -#pragma warning restore IDE1006 +#pragma warning restore IDE1006 // restore naming rule violation check { PooledNetworkWriter writer; @@ -103,7 +103,7 @@ public NetworkSerializer __beginSendServerRpc(ServerRpcParams serverRpcParams, R return writer.Serializer; } -#pragma warning disable IDE1006 +#pragma warning disable IDE1006 // disable naming rule violation check [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] #if UNITY_2020_2_OR_NEWER @@ -113,7 +113,7 @@ internal void __endSendServerRpc(NetworkSerializer serializer, ServerRpcParams s [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public void __endSendServerRpc(NetworkSerializer serializer, ServerRpcParams serverRpcParams, RpcDelivery rpcDelivery) #endif -#pragma warning restore IDE1006 +#pragma warning restore IDE1006 // restore naming rule violation check { if (serializer == null) { @@ -131,7 +131,7 @@ public void __endSendServerRpc(NetworkSerializer serializer, ServerRpcParams ser } } -#pragma warning disable IDE1006 +#pragma warning disable IDE1006 // disable naming rule violation check [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] #if UNITY_2020_2_OR_NEWER @@ -141,7 +141,7 @@ internal NetworkSerializer __beginSendClientRpc(ClientRpcParams clientRpcParams, [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public NetworkSerializer __beginSendClientRpc(ClientRpcParams clientRpcParams, RpcDelivery rpcDelivery) #endif -#pragma warning restore IDE1006 +#pragma warning restore IDE1006 // restore naming rule violation check { PooledNetworkWriter writer; @@ -208,7 +208,7 @@ public NetworkSerializer __beginSendClientRpc(ClientRpcParams clientRpcParams, R return writer.Serializer; } -#pragma warning disable IDE1006 +#pragma warning disable IDE1006 // disable naming rule violation check [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] #if UNITY_2020_2_OR_NEWER @@ -218,7 +218,7 @@ internal void __endSendClientRpc(NetworkSerializer serializer, ClientRpcParams c [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public void __endSendClientRpc(NetworkSerializer serializer, ClientRpcParams clientRpcParams, RpcDelivery rpcDelivery) #endif -#pragma warning restore IDE1006 +#pragma warning restore IDE1006 // restore naming rule violation check { if (serializer == null) { diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs index 2ff08d2ace..f35f89e54d 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs @@ -31,7 +31,7 @@ namespace MLAPI [AddComponentMenu("MLAPI/NetworkManager", -100)] public class NetworkManager : MonoBehaviour, INetworkUpdateSystem, IProfilableTransportProvider { -#pragma warning disable IDE1006 +#pragma warning disable IDE1006 // disable naming rule violation check [Browsable(false)] [EditorBrowsable(EditorBrowsableState.Never)] [DebuggerBrowsable(DebuggerBrowsableState.Never)] @@ -42,7 +42,7 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem, IProfilableTr [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public static readonly Dictionary> __ntable = new Dictionary>(); #endif -#pragma warning restore IDE1006 +#pragma warning restore IDE1006 // restore naming rule violation check #if DEVELOPMENT_BUILD || UNITY_EDITOR private static ProfilerMarker s_EventTick = new ProfilerMarker($"{nameof(NetworkManager)}.EventTick"); diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs index 8f425df9a6..36c09cbdf7 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs @@ -38,7 +38,7 @@ public struct ClientRpcParams public ClientRpcReceiveParams Receive; } -#pragma warning disable IDE1006 +#pragma warning disable IDE1006 // disable naming rule violation check #if UNITY_2020_2_OR_NEWER // RuntimeAccessModifiersILPP will make this `public` internal struct __RpcParams @@ -46,7 +46,7 @@ internal struct __RpcParams [Obsolete("Please do not use, will no longer be exposed in the future versions (framework internal)")] public struct __RpcParams #endif -#pragma warning restore IDE1006 +#pragma warning restore IDE1006 // restore naming rule violation check { public ServerRpcParams Server; public ClientRpcParams Client; diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs index dde904bfaf..a3caa686ef 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs @@ -85,9 +85,9 @@ public TransportChannel[] MLAPI_CHANNELS /// /// The channels the MLAPI will use when sending internal messages. /// -#pragma warning disable IDE1006 +#pragma warning disable IDE1006 // disable naming rule violation check private readonly TransportChannel[] MLAPI_INTERNAL_CHANNELS = -#pragma warning restore IDE1006 +#pragma warning restore IDE1006 // restore naming rule violation check { new TransportChannel(NetworkChannel.Internal, NetworkDelivery.ReliableFragmentedSequenced), new TransportChannel(NetworkChannel.ReliableRpc, NetworkDelivery.ReliableSequenced), From 17e8b2c5b595c2e8bf565ca2ee2384f83368b064 Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Mon, 29 Mar 2021 19:41:41 +0100 Subject: [PATCH 7/8] revert name changes to MLAPIProfilerModule struct fields --- .../Editor/MLAPIProfilerModule.cs | 59 ++++++++++--------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs index b6a9dd96f0..84279ada3e 100644 --- a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs +++ b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs @@ -25,8 +25,8 @@ internal static class MLAPIProfilerModule private class MLAPIProfilerCounter { // Note: These fields are named this way for internal serialization - public string Name; - public string Category; + public string m_Name; + public string m_Category; } /// @@ -36,62 +36,65 @@ private class MLAPIProfilerCounter private class MLAPIProfilerModuleData { // Note: These fields are named this way for internal serialization - public List ChartCounters = new List(); - public List DetailCounters = new List(); - public string Name; + public List m_ChartCounters = new List(); + public List m_DetailCounters = new List(); + public string m_Name; } + /// + /// This needs to be in synced with the internal dynamic module structure to provide our own counters + /// [Serializable] private class MLAPIModules { // Note: These fields are named this way for internal serialization - public List Modules; + public List m_Modules; } #pragma warning restore IDE1006 // restore naming rule violation check private static List CreateRPCCounters() => new List() { - new MLAPIProfilerCounter { Name = ProfilerConstants.RpcSent, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.RpcReceived, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.RpcBatchesSent, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.RpcBatchesReceived, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.RpcQueueProcessed, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.RpcInQueueSize, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.RpcOutQueueSize, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcSent, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcReceived, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcBatchesSent, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcBatchesReceived, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcQueueProcessed, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcInQueueSize, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcOutQueueSize, m_Category = ProfilerCategory.Network.Name }, }; private static List CreateOperationsCounters() => new List() { - new MLAPIProfilerCounter { Name = ProfilerConstants.Connections, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.ReceiveTickRate, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.Connections, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.ReceiveTickRate, m_Category = ProfilerCategory.Network.Name }, }; private static List CreateMessagesCounters() => new List() { - new MLAPIProfilerCounter { Name = ProfilerConstants.NamedMessageReceived, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.UnnamedMessageReceived, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.NamedMessageSent, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.UnnamedMessageSent, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.ByteSent, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.ByteReceived, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.NetworkVarUpdates, Category = ProfilerCategory.Network.Name }, - new MLAPIProfilerCounter { Name = ProfilerConstants.NetworkVarDeltas, Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.NamedMessageReceived, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.UnnamedMessageReceived, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.NamedMessageSent, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.UnnamedMessageSent, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.ByteSent, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.ByteReceived, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.NetworkVarUpdates, m_Category = ProfilerCategory.Network.Name }, + new MLAPIProfilerCounter { m_Name = ProfilerConstants.NetworkVarDeltas, m_Category = ProfilerCategory.Network.Name }, }; private delegate List CounterListFactoryDelegate(); private static bool CreateMLAPIDynamicModule(ref MLAPIModules mlapiModules, string moduleName, CounterListFactoryDelegate counterListFactoryDelegate) { - var module = mlapiModules.Modules.Find(x => x.Name == moduleName); + var module = mlapiModules.m_Modules.Find(x => x.m_Name == moduleName); if (module == null) { var newModule = new MLAPIProfilerModuleData { - Name = moduleName, - ChartCounters = counterListFactoryDelegate(), - DetailCounters = counterListFactoryDelegate(), + m_Name = moduleName, + m_ChartCounters = counterListFactoryDelegate(), + m_DetailCounters = counterListFactoryDelegate(), }; - mlapiModules.Modules.Add(newModule); + mlapiModules.m_Modules.Add(newModule); return true; } From 1b00c4abb8f9a33bea8293aee2a1dae5368f1fef Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Mon, 29 Mar 2021 19:52:43 +0100 Subject: [PATCH 8/8] minor cleanup --- com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs | 6 ++---- com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs index 84279ada3e..7c5a9a3aa0 100644 --- a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs +++ b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs @@ -1,11 +1,9 @@ -#if UNITY_2020_2_OR_NEWER using System; using System.Collections.Generic; -using Unity.Profiling; -using UnityEngine; using MLAPI.Profiling; -#endif +using Unity.Profiling; using UnityEditor; +using UnityEngine; namespace MLAPI { diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs index 36c09cbdf7..7e0918da8b 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs @@ -1,6 +1,4 @@ -#if !UNITY_2020_2_OR_NEWER using System; -#endif namespace MLAPI.Messaging {