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

Merge remote-tracking branch 'origin/master' into 1.9

Browse Source 
# Conflicts:
#	Source/Engine/Content/Storage/FlaxStorage.cpp
#	Source/Engine/Renderer/GBufferPass.cpp
This commit is contained in:
Wojtek Figat
2024-05-15 23:49:05 +02:00
parent 1d6e8c4b7c 1cd2f6a070
commit 97be8ee8cc
54 changed files with 902 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Tools/Flax.Build/Bindings/ApiTypeInfo.cs
View File

@@ -98,7 +98,7 @@ namespace Flax.Build.Bindings
{
var result = NativeName;
if (Parent != null && !(Parent is FileInfo))
result = Parent.FullNameNative + '_' + result;
result = Parent.FullNameNative.Replace("::", "_") + '_' + result;
return result;
}
}

15
Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
View File

@@ -267,13 +267,21 @@ namespace Flax.Build.Bindings
if (value.Contains('(') && value.Contains(')'))
return "new " + value;
// Special case for non-strongly typed enums
if (valueType != null && !value.Contains('.', StringComparison.Ordinal))
{
apiType = FindApiTypeInfo(buildData, valueType, caller);
if (apiType is EnumInfo)
return $"{apiType.Name}.{value}";
}
return value;
}
private static string GenerateCSharpNativeToManaged(BuildData buildData, TypeInfo typeInfo, ApiTypeInfo caller, bool marshalling = false)
{
string result;
if (typeInfo?.Type == null)
if (typeInfo == null || typeInfo.Type == null)
throw new ArgumentNullException();
// Use dynamic array as wrapper container for fixed-size native arrays
@@ -1641,8 +1649,9 @@ namespace Flax.Build.Bindings
if (internalType)
{
// Marshal blittable array elements back to original non-blittable elements
string originalElementTypeMarshaller = originalElementType + "Marshaller";
string internalElementType = $"{originalElementTypeMarshaller}.{originalElementType}Internal";
string originalElementTypeMarshaller = $"{originalElementType}Marshaller";
string originalElementTypeName = originalElementType.Substring(originalElementType.LastIndexOf('.') + 1); // Strip namespace
string internalElementType = $"{originalElementTypeMarshaller}.{originalElementTypeName}Internal";
toManagedContent.AppendLine($"unmanaged.{fieldInfo.Name} != IntPtr.Zero ? NativeInterop.ConvertArray((Unsafe.As<ManagedArray>(ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}).Target)).ToSpan<{internalElementType}>(), {originalElementTypeMarshaller}.ToManaged) : null;");
toNativeContent.AppendLine($"managed.{fieldInfo.Name}?.Length > 0 ? ManagedHandle.ToIntPtr(ManagedArray.WrapNewArray(NativeInterop.ConvertArray(managed.{fieldInfo.Name}, {originalElementTypeMarshaller}.ToNative)), GCHandleType.Weak) : IntPtr.Zero;");
freeContents.AppendLine($"if (unmanaged.{fieldInfo.Name} != IntPtr.Zero) {{ ManagedHandle handle = ManagedHandle.FromIntPtr(unmanaged.{fieldInfo.Name}); Span<{internalElementType}> values = (Unsafe.As<ManagedArray>(handle.Target)).ToSpan<{internalElementType}>(); foreach (var value in values) {{ {originalElementTypeMarshaller}.Free(value); }} (Unsafe.As<ManagedArray>(handle.Target)).Free(); handle.Free(); }}");

9
Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
View File

@@ -1991,13 +1991,8 @@ namespace Flax.Build.Bindings
}
contents.Append(')').AppendLine();
contents.Append(" {").AppendLine();
if (buildData.Target.IsEditor && false)
contents.Append(" MMethod* method = nullptr;").AppendLine(); // TODO: find a better way to cache event method in editor and handle C# hot-reload
else
contents.Append(" static MMethod* method = nullptr;").AppendLine();
contents.Append(" if (!method)").AppendLine();
contents.AppendFormat(" method = {1}::TypeInitializer.GetClass()->GetMethod(\"Internal_{0}_Invoke\", {2});", eventInfo.Name, classTypeNameNative, paramsCount).AppendLine();
contents.Append(" CHECK(method);").AppendLine();
contents.Append(" static MMethod* method = nullptr;").AppendLine();
contents.AppendFormat(" if (!method) {{ method = {1}::TypeInitializer.GetClass()->GetMethod(\"Internal_{0}_Invoke\", {2}); CHECK(method); }}", eventInfo.Name, classTypeNameNative, paramsCount).AppendLine();
contents.Append(" MObject* exception = nullptr;").AppendLine();
if (paramsCount == 0)
contents.AppendLine(" void** params = nullptr;");