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

Fix using Delegate<> in API event

Browse Source
This commit is contained in:
Wojtek Figat
2021-04-14 12:23:50 +02:00
parent 7dd2a8fac9
commit 7b2c034fba
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Engine/Core/Delegate.h
View File

@@ -4,11 +4,6 @@
#include "Engine/Core/Memory/Allocation.h" #include "Engine/Core/Memory/Allocation.h"
template<typename>
class Function;
template<typename... Params>
class Delegate;
/// <summary> /// <summary>
/// The function object. /// The function object.
/// </summary> /// </summary>

4
Source/Engine/Core/Types/BaseTypes.h
View File

@@ -97,6 +97,10 @@ template<typename T, typename U>
class Pair; class Pair;
template<typename KeyType, typename ValueType> template<typename KeyType, typename ValueType>
class Dictionary; class Dictionary;
template<typename>
class Function;
template<typename... Params>
class Delegate;
// Declares full set of operators for the enum type (using binary operation on integer values) // Declares full set of operators for the enum type (using binary operation on integer values)
#define DECLARE_ENUM_OPERATORS(T) \ #define DECLARE_ENUM_OPERATORS(T) \

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

@@ -136,6 +136,8 @@ namespace Flax.Build.Bindings
private static string GenerateCSharpNativeToManaged(BuildData buildData, TypeInfo typeInfo, ApiTypeInfo caller) private static string GenerateCSharpNativeToManaged(BuildData buildData, TypeInfo typeInfo, ApiTypeInfo caller)
{ {
string result; string result;
if (typeInfo?.Type == null)
throw new ArgumentNullException();
// Use dynamic array as wrapper container for fixed-size native arrays // Use dynamic array as wrapper container for fixed-size native arrays
if (typeInfo.IsArray) if (typeInfo.IsArray)

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

@@ -1136,6 +1136,7 @@ namespace Flax.Build.Bindings
// C# event invoking wrapper (calls C# event from C++ delegate) // C# event invoking wrapper (calls C# event from C++ delegate)
CppIncludeFiles.Add("Engine/Scripting/ManagedCLR/MEvent.h"); CppIncludeFiles.Add("Engine/Scripting/ManagedCLR/MEvent.h");
CppIncludeFiles.Add("Engine/Scripting/ManagedCLR/MClass.h");
contents.Append(" "); contents.Append(" ");
if (eventInfo.IsStatic) if (eventInfo.IsStatic)
contents.Append("static "); contents.Append("static ");
@@ -1150,7 +1151,7 @@ namespace Flax.Build.Bindings
contents.Append(" {").AppendLine(); contents.Append(" {").AppendLine();
contents.Append(" static MMethod* mmethod = nullptr;").AppendLine(); contents.Append(" static MMethod* mmethod = nullptr;").AppendLine();
contents.Append(" if (!mmethod)").AppendLine(); contents.Append(" if (!mmethod)").AppendLine();
contents.AppendFormat(" mmethod = {1}::GetStaticClass()->GetMethod(\"Internal_{0}_Invoke\", {2});", eventInfo.Name, classTypeNameNative, paramsCount).AppendLine(); contents.AppendFormat(" mmethod = {1}::TypeInitializer.GetType().ManagedClass->GetMethod(\"Internal_{0}_Invoke\", {2});", eventInfo.Name, classTypeNameNative, paramsCount).AppendLine();
contents.Append(" CHECK(mmethod);").AppendLine(); contents.Append(" CHECK(mmethod);").AppendLine();
contents.Append(" MonoObject* exception = nullptr;").AppendLine(); contents.Append(" MonoObject* exception = nullptr;").AppendLine();
if (paramsCount == 0) if (paramsCount == 0)

4
Source/Tools/Flax.Build/Bindings/BindingsGenerator.Parsing.cs
View File

@@ -213,7 +213,9 @@ namespace Flax.Build.Bindings
type.GenericArgs = new List<TypeInfo>(); type.GenericArgs = new List<TypeInfo>();
do do
{ {
type.GenericArgs.Add(ParseType(ref context)); var argType = ParseType(ref context);
if (argType.Type != null)
type.GenericArgs.Add(argType);
token = context.Tokenizer.NextToken(); token = context.Tokenizer.NextToken();
} while (token.Type != TokenType.RightAngleBracket); } while (token.Type != TokenType.RightAngleBracket);