charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MessageClassProcessor made static

Browse Source
This commit is contained in:
vis2k 2019-01-01 15:54:26 +01:00
parent 40a3ecce08
commit 722a63f1c2
2 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Mirror/Weaver/Processors/MessageClassProcessor.cs
View File

@ -4,53 +4,45 @@
namespace Mirror.Weaver
{
class MessageClassProcessor
static class MessageClassProcessor
{
TypeDefinition m_td;
public MessageClassProcessor(TypeDefinition td)
public static void Process(TypeDefinition td)
{
Weaver.DLog(td, "MessageClassProcessor for " + td.Name);
m_td = td;
}
public void Process()
{
Weaver.DLog(m_td, "MessageClassProcessor Start");
Weaver.DLog(td, "MessageClassProcessor Start");
Weaver.ResetRecursionCount();
GenerateSerialization();
GenerateSerialization(td);
if (Weaver.fail)
{
return;
}
GenerateDeSerialization();
Weaver.DLog(m_td, "MessageClassProcessor Done");
GenerateDeSerialization(td);
Weaver.DLog(td, "MessageClassProcessor Done");
}
void GenerateSerialization()
static void GenerateSerialization(TypeDefinition td)
{
Weaver.DLog(m_td, " GenerateSerialization");
foreach (MethodDefinition m in m_td.Methods)
Weaver.DLog(td, " GenerateSerialization");
foreach (MethodDefinition m in td.Methods)
{
if (m.Name == "Serialize")
return;
}
if (m_td.Fields.Count == 0)
if (td.Fields.Count == 0)
{
return;
}
// check for self-referencing types
foreach (FieldDefinition field in m_td.Fields)
foreach (FieldDefinition field in td.Fields)
{
if (field.FieldType.FullName == m_td.FullName)
if (field.FieldType.FullName == td.FullName)
{
Weaver.fail = true;
Log.Error("GenerateSerialization for " + m_td.Name + " [" + field.FullName + "]. [MessageBase] member cannot be self referencing.");
Log.Error("GenerateSerialization for " + td.Name + " [" + field.FullName + "]. [MessageBase] member cannot be self referencing.");
return;
}
}
@ -63,7 +55,7 @@ void GenerateSerialization()
serializeFunc.Parameters.Add(new ParameterDefinition("writer", ParameterAttributes.None, Weaver.scriptDef.MainModule.ImportReference(Weaver.NetworkWriterType)));
ILProcessor serWorker = serializeFunc.Body.GetILProcessor();
foreach (FieldDefinition field in m_td.Fields)
foreach (FieldDefinition field in td.Fields)
{
if (field.IsStatic || field.IsPrivate || field.IsSpecialName)
continue;
@ -71,14 +63,14 @@ void GenerateSerialization()
if (field.FieldType.Resolve().HasGenericParameters)
{
Weaver.fail = true;
Log.Error("GenerateSerialization for " + m_td.Name + " [" + field.FieldType + "/" + field.FieldType.FullName + "]. [MessageBase] member cannot have generic parameters.");
Log.Error("GenerateSerialization for " + td.Name + " [" + field.FieldType + "/" + field.FieldType.FullName + "]. [MessageBase] member cannot have generic parameters.");
return;
}
if (field.FieldType.Resolve().IsInterface)
{
Weaver.fail = true;
Log.Error("GenerateSerialization for " + m_td.Name + " [" + field.FieldType + "/" + field.FieldType.FullName + "]. [MessageBase] member cannot be an interface.");
Log.Error("GenerateSerialization for " + td.Name + " [" + field.FieldType + "/" + field.FieldType.FullName + "]. [MessageBase] member cannot be an interface.");
return;
}
@ -93,25 +85,25 @@ void GenerateSerialization()
else
{
Weaver.fail = true;
Log.Error("GenerateSerialization for " + m_td.Name + " unknown type [" + field.FieldType + "/" + field.FieldType.FullName + "]. [MessageBase] member variables must be basic types.");
Log.Error("GenerateSerialization for " + td.Name + " unknown type [" + field.FieldType + "/" + field.FieldType.FullName + "]. [MessageBase] member variables must be basic types.");
return;
}
}
serWorker.Append(serWorker.Create(OpCodes.Ret));
m_td.Methods.Add(serializeFunc);
td.Methods.Add(serializeFunc);
}
void GenerateDeSerialization()
static void GenerateDeSerialization(TypeDefinition td)
{
Weaver.DLog(m_td, " GenerateDeserialization");
foreach (var m in m_td.Methods)
Weaver.DLog(td, " GenerateDeserialization");
foreach (var m in td.Methods)
{
if (m.Name == "Deserialize")
return;
}
if (m_td.Fields.Count == 0)
if (td.Fields.Count == 0)
{
return;
}
@ -124,7 +116,7 @@ void GenerateDeSerialization()
serializeFunc.Parameters.Add(new ParameterDefinition("reader", ParameterAttributes.None, Weaver.scriptDef.MainModule.ImportReference(Weaver.NetworkReaderType)));
ILProcessor serWorker = serializeFunc.Body.GetILProcessor();
foreach (FieldDefinition field in m_td.Fields)
foreach (FieldDefinition field in td.Fields)
{
if (field.IsStatic || field.IsPrivate || field.IsSpecialName)
continue;
@ -140,13 +132,13 @@ void GenerateDeSerialization()
else
{
Weaver.fail = true;
Log.Error("GenerateDeSerialization for " + m_td.Name + " unknown type [" + field.FieldType + "]. [SyncVar] member variables must be basic types.");
Log.Error("GenerateDeSerialization for " + td.Name + " unknown type [" + field.FieldType + "]. [SyncVar] member variables must be basic types.");
return;
}
}
serWorker.Append(serWorker.Create(OpCodes.Ret));
m_td.Methods.Add(serializeFunc);
td.Methods.Add(serializeFunc);
}
}
}

3
Mirror/Weaver/Weaver.cs
View File

@ -1023,8 +1023,7 @@ static void ProcessPropertySites()
static bool ProcessMessageType(TypeDefinition td)
{
var proc = new MessageClassProcessor(td);
proc.Process();
MessageClassProcessor.Process(td);
return true;
}