Skip to content

Commit ec94e48

Browse files
Tweety-LabTweety-Lab
committed
Begin refactor.
1 parent 17a74e9 commit ec94e48

5 files changed

Lines changed: 206 additions & 216 deletions

File tree

‎NetLeaf.Bridge/Assemblies.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
using System.Linq;
5-
using System.Reflection;
1+
using System.Reflection;
62

73
namespace NetLeaf.Bridge;
84

‎NetLeaf.Bridge/InstanceFactory.cs‎

Lines changed: 81 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -2,107 +2,113 @@
22
using System.Collections.Generic;
33
using System.Reflection;
44

5-
namespace NetLeaf.Bridge
5+
namespace NetLeaf.Bridge;
6+
7+
/// <summary>
8+
/// Management of class instances.
9+
/// </summary>
10+
public static class InstanceFactory
611
{
12+
// Map C++ IDs to Class Instances
13+
// TODO: Check if we can replace a uint handle with IntPtr to C++ Class?
14+
private static Dictionary<uint, object> instanceMap = new Dictionary<uint, object>();
15+
private static uint currentID = 0;
16+
717
/// <summary>
8-
/// Management of class instances.
18+
/// Create a class instance from its type.
919
/// </summary>
10-
public static class InstanceFactory
20+
/// <param name="typeNamespace">Type to instantiate.</param>
21+
/// <returns>ID/Handle.</returns>
22+
public static uint CreateInstance(string typeNamespace)
1123
{
12-
// Map C++ IDs to Class Instances
13-
// TODO: Check if we can replace a uint handle with IntPtr to C++ Class?
14-
private static Dictionary<uint, object> instanceMap = new Dictionary<uint, object>();
15-
private static uint currentID = 0;
24+
uint id = currentID++;
1625

17-
// Create an instance from its namespace
18-
public static uint CreateInstance(string typeNamespace)
26+
try
1927
{
20-
uint id = currentID++;
21-
22-
try
23-
{
24-
Type type = Assemblies.FindTypeInLoadedAssemblies(typeNamespace);
25-
if (type == null)
26-
{
27-
Console.WriteLine($"[CreateInstance Error] Type '{typeNamespace}' not found in loaded assemblies.");
28-
return 0;
29-
}
30-
31-
object instance = Activator.CreateInstance(type);
32-
instanceMap[id] = instance;
33-
return id;
34-
}
35-
catch (Exception ex)
28+
Type type = Assemblies.FindTypeInLoadedAssemblies(typeNamespace);
29+
if (type == null)
3630
{
37-
Console.WriteLine($"[CreateInstance Error] {ex.Message}");
31+
Console.WriteLine($"[CreateInstance Error] Type '{typeNamespace}' not found in loaded assemblies.");
3832
return 0;
3933
}
40-
}
4134

42-
// Delete an instance from its ID/Handle
43-
// It's deconstructor will be called on the next GC cycle
44-
public static void DeleteInstance(uint id)
35+
object instance = Activator.CreateInstance(type);
36+
instanceMap[id] = instance;
37+
return id;
38+
}
39+
catch (Exception ex)
4540
{
46-
instanceMap.Remove(id);
41+
Console.WriteLine($"[CreateInstance Error] {ex.Message}");
42+
return 0;
4743
}
44+
}
4845

49-
// Run an instance's method from its ID/Handle and the method name
50-
public static void RunInstanceMethod(uint id, string methodCall)
51-
{
52-
// Get the instance
53-
if (!instanceMap.TryGetValue(id, out object instance))
54-
return;
46+
/// <summary>
47+
/// Delete an instance from its ID/Handle.
48+
/// </summary>
49+
/// <param name="id">The ID/Handle.</param>
50+
public static void DeleteInstance(uint id) => instanceMap.Remove(id);
5551

56-
// Parse the method call into method name and arguments
57-
Type type = instance.GetType();
58-
string methodName = ParseMethodName(methodCall, out string[] argStrings);
52+
/// <summary>
53+
/// Run an instance's method from its ID/Handle and the method name
54+
/// </summary>
55+
/// <param name="id">The ID/Handle.</param>
56+
/// <param name="methodCall">The method name.</param>
57+
public static void RunInstanceMethod(uint id, string methodCall)
58+
{
59+
// Get the instance
60+
if (!instanceMap.TryGetValue(id, out object instance))
61+
return;
5962

60-
if (methodName == null)
61-
return;
63+
// Parse the method call into method name and arguments
64+
Type type = instance.GetType();
65+
string methodName = ParseMethodName(methodCall, out string[] argStrings);
6266

63-
// Find the method matching the name and the number of arguments
64-
var method = type.GetMethod(methodName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
67+
if (methodName == null)
68+
return;
6569

66-
if (method == null)
67-
return;
70+
// Find the method matching the name and the number of arguments
71+
var method = type.GetMethod(methodName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
6872

69-
// Convert arguments to the correct types
70-
object[] args = ConvertArguments(method, argStrings);
71-
method.Invoke(instance, args);
72-
}
73+
if (method == null)
74+
return;
7375

74-
private static string ParseMethodName(string methodCall, out string[] args)
75-
{
76-
int parenStart = methodCall.IndexOf('(');
77-
int parenEnd = methodCall.LastIndexOf(')');
76+
// Convert arguments to the correct types
77+
object[] args = ConvertArguments(method, argStrings);
78+
method.Invoke(instance, args);
79+
}
7880

79-
if (parenStart == -1 || parenEnd == -1 || parenEnd <= parenStart)
80-
{
81-
args = null;
82-
return null;
83-
}
81+
private static string ParseMethodName(string methodCall, out string[] args)
82+
{
83+
int parenStart = methodCall.IndexOf('(');
84+
int parenEnd = methodCall.LastIndexOf(')');
8485

85-
string methodName = methodCall.Substring(0, parenStart).Trim();
86-
string argsStr = methodCall.Substring(parenStart + 1, parenEnd - parenStart - 1).Trim();
86+
if (parenStart == -1 || parenEnd == -1 || parenEnd <= parenStart)
87+
{
88+
args = null;
89+
return null;
90+
}
8791

88-
args = argsStr.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
89-
.Select(arg => arg.Trim())
90-
.ToArray();
92+
string methodName = methodCall.Substring(0, parenStart).Trim();
93+
string argsStr = methodCall.Substring(parenStart + 1, parenEnd - parenStart - 1).Trim();
9194

92-
return methodName;
93-
}
95+
args = argsStr.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
96+
.Select(arg => arg.Trim())
97+
.ToArray();
9498

95-
private static object[] ConvertArguments(MethodInfo method, string[] argStrings)
96-
{
97-
ParameterInfo[] paramInfos = method.GetParameters();
98-
object[] finalArgs = new object[argStrings.Length];
99+
return methodName;
100+
}
99101

100-
for (int i = 0; i < argStrings.Length; i++)
101-
{
102-
finalArgs[i] = Convert.ChangeType(argStrings[i], paramInfos[i].ParameterType);
103-
}
102+
private static object[] ConvertArguments(MethodInfo method, string[] argStrings)
103+
{
104+
ParameterInfo[] paramInfos = method.GetParameters();
105+
object[] finalArgs = new object[argStrings.Length];
104106

105-
return finalArgs;
107+
for (int i = 0; i < argStrings.Length; i++)
108+
{
109+
finalArgs[i] = Convert.ChangeType(argStrings[i], paramInfos[i].ParameterType);
106110
}
111+
112+
return finalArgs;
107113
}
108114
}

‎NetLeaf.Bridge/MethodReturnValue.cs‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,24 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Runtime.InteropServices;
5-
using System.Text;
6-
using System.Threading.Tasks;
1+
using System.Runtime.InteropServices;
72

8-
namespace NetLeaf.Bridge
3+
namespace NetLeaf.Bridge;
4+
5+
// Struct for passing a methods return value back to C++
6+
[StructLayout(LayoutKind.Sequential)]
7+
public struct MethodReturnValue
98
{
10-
// Struct for passing a methods return value back to C++
11-
[StructLayout(LayoutKind.Sequential)]
12-
public struct MethodReturnValue
13-
{
14-
public IntPtr StringResult; // Pointer to marshaled string
15-
public float FloatResult;
16-
public uint UIntResult;
17-
public int IntResult;
9+
public IntPtr StringResult; // Pointer to marshaled string
10+
public float FloatResult;
11+
public uint UIntResult;
12+
public int IntResult;
1813

19-
public ReturnType Type; // Indicate the type of the return value
20-
}
14+
public ReturnType Type; // Indicate the type of the return value
15+
}
2116

22-
public enum ReturnType : int
23-
{
24-
None = 0,
25-
String = 1,
26-
Float = 2,
27-
UInt = 3,
28-
Int = 4
29-
}
17+
public enum ReturnType : int
18+
{
19+
None = 0,
20+
String = 1,
21+
Float = 2,
22+
UInt = 3,
23+
Int = 4
3024
}

0 commit comments

Comments
 (0)