Skip to content

feat: Serializable Types (RFC#2) #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xFA11 merged 13 commits into from
Feb 2, 2021
Merged

feat: Serializable Types (RFC#2) #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
210d7ff
initial BitSerializer and Tests implementation
0xFA11 Jan 23, 2021
a088ece
implement tests
0xFA11 Jan 23, 2021
46a40d4
fix BitWriter.WriteColor32 bug, implement more tests
0xFA11 Jan 23, 2021
7c37de0
implement more array serialization and more serialization tests
0xFA11 Jan 24, 2021
f5a77e1
ILPP to utilize BitSerializer (arrays still WIP)
0xFA11 Jan 25, 2021
aa228bf
implement enum array serialization ILPP
0xFA11 Jan 28, 2021
9ca8ac8
implement INetworkSerializable array serialization ILPP
0xFA11 Jan 29, 2021
f850dec
implement passing RPC params over __ntable
0xFA11 Jan 29, 2021
4f607f5
implement whole ServerRpcParams & ClientRpcParams to passthrough RPC …
0xFA11 Jan 29, 2021
88ccb26
Merge branch 'develop' into feature/serializable-types
0xFA11 Jan 29, 2021
f2ad3a6
fix small field naming typo
0xFA11 Jan 29, 2021
70ba77f
minor pooling optimization
0xFA11 Feb 1, 2021
3062258
Merge branch 'develop' into feature/serializable-types
0xFA11 Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ internal static class CodeGenHelpers
public static readonly string ServerRpcParams_FullName = typeof(ServerRpcParams).FullName;
public static readonly string ClientRpcParams_FullName = typeof(ClientRpcParams).FullName;
public static readonly string INetworkSerializable_FullName = typeof(INetworkSerializable).FullName;
public static readonly string INetworkSerializable_NetworkRead_Name = nameof(INetworkSerializable.NetworkRead);
public static readonly string INetworkSerializable_NetworkWrite_Name = nameof(INetworkSerializable.NetworkWrite);
public static readonly string INetworkSerializable_NetworkSerialize_Name = nameof(INetworkSerializable.NetworkSerialize);
public static readonly string UnityColor_FullName = typeof(Color).FullName;
public static readonly string UnityColor32_FullName = typeof(Color32).FullName;
public static readonly string UnityVector2_FullName = typeof(Vector2).FullName;
public static readonly string UnityVector3_FullName = typeof(Vector3).FullName;
public static readonly string UnityVector4_FullName = typeof(Vector4).FullName;
Expand Down Expand Up @@ -78,6 +78,8 @@ public static bool IsSubclassOf(this TypeDefinition typeDefinition, string Class

public static bool HasInterface(this TypeReference typeReference, string InterfaceTypeFullName)
{
if (typeReference.IsArray) return false;

try
{
var typeDef = typeReference.Resolve();
Expand All @@ -91,11 +93,11 @@ public static bool HasInterface(this TypeReference typeReference, string Interfa
return false;
}

public static bool IsSupportedType(this TypeReference typeReference)
public static bool IsSerializable(this TypeReference typeReference)
{
var typeSystem = typeReference.Module.TypeSystem;

// common primitives
// C# primitives
if (typeReference == typeSystem.Boolean) return true;
if (typeReference == typeSystem.Char) return true;
if (typeReference == typeSystem.SByte) return true;
Expand All @@ -112,31 +114,30 @@ public static bool IsSupportedType(this TypeReference typeReference)

// Unity primitives
if (typeReference.FullName == UnityColor_FullName) return true;
if (typeReference.FullName == UnityColor32_FullName) return true;
if (typeReference.FullName == UnityVector2_FullName) return true;
if (typeReference.FullName == UnityVector3_FullName) return true;
if (typeReference.FullName == UnityVector4_FullName) return true;
if (typeReference.FullName == UnityQuaternion_FullName) return true;
if (typeReference.FullName == UnityRay_FullName) return true;
if (typeReference.FullName == UnityRay2D_FullName) return true;

// INetworkSerializable
if (typeReference.HasInterface(INetworkSerializable_FullName)) return true;

// Enum
if (typeReference.GetEnumAsInt() != null) return true;

// todo: [RFC] Serializable Types
// StaticArray[]
// IEnumerable<T>
// IEnumerable<KeyValuePair<K, V>>
// IEnumerable<Tuple<T1, T2, T3...T7>>
// IEnumerable<Tuple<T1, T2...TRest>>
// INetworkSerializable
if (typeReference.HasInterface(INetworkSerializable_FullName)) return true;

// Static array
if (typeReference.IsArray) return typeReference.GetElementType().IsSerializable();

return false;
}

public static TypeReference GetEnumAsInt(this TypeReference typeReference)
{
if (typeReference.IsArray) return null;

try
{
var typeDef = typeReference.Resolve();
Expand Down
4 changes: 2 additions & 2 deletions com.unity.multiplayer.mlapi/Editor/CodeGen/ILPostProcessorProgram.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,10 @@ void WriteAssembly(InMemoryAssembly inMemoryAssembly, string outputPath, string
switch (message.DiagnosticType)
{
case DiagnosticType.Error:
Debug.LogError($"ILPostProcessor Error - {message.MessageData} {message.File} {message.Line} {message.Column}");
Debug.LogError($"ILPostProcessor Error - {message.MessageData} {message.File}:{message.Line}");
break;
case DiagnosticType.Warning:
Debug.LogWarning($"ILPostProcessor Warning - {message.MessageData} {message.File} {message.Line} {message.Column}");
Debug.LogWarning($"ILPostProcessor Warning - {message.MessageData} {message.File}:{message.Line}");
break;
}
}
Expand Down
Loading