GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'networking-plugin-fix' of https://github.com/LOOPDISK/FlaxEngine into LOOPDISK-networking-plugin-fix

Browse Source
This commit is contained in:
Wojtek Figat
2024-03-14 17:31:19 +01:00
parent 3ba6867cd2 574e0ab1f8
commit 8a7ddae76b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs
View File

@@ -839,10 +839,11 @@ namespace Flax.Build.Plugins
module.GetType("System.IntPtr", out var intPtrType); module.GetType("System.IntPtr", out var intPtrType);
module.GetType("FlaxEngine.Object", out var scriptingObjectType); module.GetType("FlaxEngine.Object", out var scriptingObjectType);
var fromUnmanagedPtr = scriptingObjectType.Resolve().GetMethod("FromUnmanagedPtr"); var fromUnmanagedPtr = scriptingObjectType.Resolve().GetMethod("FromUnmanagedPtr");
TypeReference intPtr = module.ImportReference(intPtrType);
var m = new MethodDefinition(name + "Native", MethodAttributes.Public | MethodAttributes.Static | MethodAttributes.HideBySig, context.VoidType); var m = new MethodDefinition(name + "Native", MethodAttributes.Public | MethodAttributes.Static | MethodAttributes.HideBySig, context.VoidType);
m.Parameters.Add(new ParameterDefinition("instancePtr", ParameterAttributes.None, intPtrType)); m.Parameters.Add(new ParameterDefinition("instancePtr", ParameterAttributes.None, intPtr));
m.Parameters.Add(new ParameterDefinition("streamPtr", ParameterAttributes.None, intPtrType)); m.Parameters.Add(new ParameterDefinition("streamPtr", ParameterAttributes.None, intPtr));
TypeReference networkStream = module.ImportReference(context.NetworkStreamType); TypeReference networkStream = module.ImportReference(context.NetworkStreamType);
ILProcessor il = m.Body.GetILProcessor(); ILProcessor il = m.Body.GetILProcessor();
il.Emit(OpCodes.Nop); il.Emit(OpCodes.Nop);
@@ -1645,12 +1646,13 @@ namespace Flax.Build.Plugins
module.GetType("FlaxEngine.Object", out var scriptingObjectType); module.GetType("FlaxEngine.Object", out var scriptingObjectType);
var fromUnmanagedPtr = scriptingObjectType.Resolve().GetMethod("FromUnmanagedPtr"); var fromUnmanagedPtr = scriptingObjectType.Resolve().GetMethod("FromUnmanagedPtr");
TypeReference networkStream = module.ImportReference(networkStreamType); TypeReference networkStream = module.ImportReference(networkStreamType);
TypeReference intPtr = module.ImportReference(intPtrType);
// Generate static method to execute RPC locally // Generate static method to execute RPC locally
{ {
var m = new MethodDefinition(method.Name + "_Execute", MethodAttributes.Static | MethodAttributes.Assembly | MethodAttributes.HideBySig, voidType); var m = new MethodDefinition(method.Name + "_Execute", MethodAttributes.Static | MethodAttributes.Assembly | MethodAttributes.HideBySig, voidType);
m.Parameters.Add(new ParameterDefinition("instancePtr", ParameterAttributes.None, intPtrType)); m.Parameters.Add(new ParameterDefinition("instancePtr", ParameterAttributes.None, intPtr));
m.Parameters.Add(new ParameterDefinition("streamPtr", ParameterAttributes.None, module.ImportReference(intPtrType))); m.Parameters.Add(new ParameterDefinition("streamPtr", ParameterAttributes.None, intPtr));
ILProcessor ilp = m.Body.GetILProcessor(); ILProcessor ilp = m.Body.GetILProcessor();
var il = new DotnetIlContext(ilp, method); var il = new DotnetIlContext(ilp, method);
il.Emit(OpCodes.Nop); il.Emit(OpCodes.Nop);