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

Fix #2388 namespaces overlap in some plugins

Browse Source
This commit is contained in:
Wojtek Figat
2024-06-08 12:47:15 +02:00
parent a4877c6294
commit 50c29f6a9b
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved. // Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
//#define AUTO_DOC_TOOLTIPS //#define AUTO_DOC_TOOLTIPS
//#define MARSHALLER_FULL_NAME
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -966,7 +967,13 @@ namespace Flax.Build.Bindings
if (!classInfo.IsStatic) if (!classInfo.IsStatic)
{ {
marshallerName = classInfo.Name + "Marshaller"; marshallerName = classInfo.Name + "Marshaller";
#if MARSHALLER_FULL_NAME
marshallerFullName = !string.IsNullOrEmpty(interopNamespace) ? $"{interopNamespace}.{marshallerName}" : marshallerName; marshallerFullName = !string.IsNullOrEmpty(interopNamespace) ? $"{interopNamespace}.{marshallerName}" : marshallerName;
#else
if (!string.IsNullOrEmpty(interopNamespace))
CSharpUsedNamespaces.Add(interopNamespace);
marshallerFullName = marshallerName;
#endif
contents.Append(indent).AppendLine($"[NativeMarshalling(typeof({marshallerFullName}))]"); contents.Append(indent).AppendLine($"[NativeMarshalling(typeof({marshallerFullName}))]");
} }
#endif #endif
@@ -1487,7 +1494,13 @@ namespace Flax.Build.Bindings
// NOTE: Permanent FlaxEngine.Object GCHandles must not be released when marshalling from native to managed. // NOTE: Permanent FlaxEngine.Object GCHandles must not be released when marshalling from native to managed.
string marshallerName = structureInfo.Name + "Marshaller"; string marshallerName = structureInfo.Name + "Marshaller";
#if MARSHALLER_FULL_NAME
string marshallerFullName = !string.IsNullOrEmpty(interopNamespace) ? $"{interopNamespace}.{marshallerName}" : marshallerName; string marshallerFullName = !string.IsNullOrEmpty(interopNamespace) ? $"{interopNamespace}.{marshallerName}" : marshallerName;
#else
if (!string.IsNullOrEmpty(interopNamespace))
CSharpUsedNamespaces.Add(interopNamespace);
string marshallerFullName = marshallerName;
#endif
structNativeMarshaling = $"[NativeMarshalling(typeof({marshallerFullName}))]"; structNativeMarshaling = $"[NativeMarshalling(typeof({marshallerFullName}))]";
var toManagedContent = GetStringBuilder(); var toManagedContent = GetStringBuilder();