Skip to content

Support return values in ULuaDelegate::ProcessEvent #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
micheljung wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Support return values in ULuaDelegate::ProcessEvent #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions Source/LuaMachine/Private/LuaDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ void ULuaDelegate::ProcessEvent(UFunction* Function, void* Parms)
}

TArray<FLuaValue> LuaArgs;
#if ENGINE_MAJOR_VERSION > 4 ||ENGINE_MINOR_VERSION >= 25

#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 25
// Collect input parameters (exclude return parm)
for (TFieldIterator<FProperty> It(LuaDelegateSignature); (It && (It->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == CPF_Parm); ++It)
{
FProperty* Prop = *It;
Expand All @@ -36,5 +38,31 @@ void ULuaDelegate::ProcessEvent(UFunction* Function, void* Parms)
LuaArgs.Add(LuaState->FromProperty(Parms, Prop, bPropSuccess, 0));
}

ULuaBlueprintFunctionLibrary::LuaGlobalCallValue(LuaState->GetWorld(), LuaState->GetClass(), LuaValue, LuaArgs);
// Call the Lua function and capture the return value
const FLuaValue LuaReturnValue = ULuaBlueprintFunctionLibrary::LuaGlobalCallValue(
LuaState->GetWorld(),
LuaState->GetClass(),
LuaValue,
LuaArgs
);

// Find the return property and set its value
#if ENGINE_MAJOR_VERSION > 4 || ENGINE_MINOR_VERSION >= 25
for (TFieldIterator<FProperty> It(LuaDelegateSignature); It; ++It)
{
FProperty* Prop = *It;
#else
for (TFieldIterator<UProperty> It(LuaDelegateSignature); It; ++It)
{
UProperty* Prop = *It;
#endif
if (Prop->HasAnyPropertyFlags(CPF_ReturnParm))
{
bool bReturnSuccess = false;
LuaState->ToProperty(Parms, Prop, LuaReturnValue, bReturnSuccess, 0);
// Only one return value is supported
break;
}
}
}