Skip to content
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

Jump to bottom

Update Value class #3

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Update Value class #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68e79dc
Fix compilation for UE 5.3
codemaster Dec 25, 2023
b5837c0
Update Value class
codemaster Dec 30, 2023
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
10 changes: 5 additions & 5 deletions Source/YarnSpinner/Private/DialogueRunner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ void ADialogueRunner::PreInitializeComponents()
return YarnSubsystem()->GetYarnLibraryRegistry()->GetExpectedFunctionParamCount(FName(UTF8_TO_TCHAR(FunctionName.c_str())));
};

VirtualMachine->CallFunction = [this](const std::string& FunctionName, const std::vector<Yarn::Value>& Parameters) -> Yarn::Value
VirtualMachine->CallFunction = [this](const std::string& FunctionName, const std::vector<Yarn::FValue>& Parameters) -> Yarn::FValue
{
return YarnSubsystem()->GetYarnLibraryRegistry()->CallFunction(
FName(UTF8_TO_TCHAR(FunctionName.c_str())),
TArray<Yarn::Value>(Parameters.data(), Parameters.size())
TArray<Yarn::FValue>(Parameters.data(), Parameters.size())
);
};

Expand Down Expand Up @@ -336,10 +336,10 @@ bool ADialogueRunner::HasValue(std::string Name)
}


Yarn::Value ADialogueRunner::GetValue(std::string Name)
Yarn::FValue ADialogueRunner::GetValue(std::string Name)
{
Yarn::Value Value = YarnSubsystem()->GetValue(Name);
YS_LOG("Retrieving variable %s with value %s", UTF8_TO_TCHAR(Name.c_str()), UTF8_TO_TCHAR(Value.ConvertToString().c_str()))
Yarn::FValue Value = YarnSubsystem()->GetValue(Name);
YS_LOG("Retrieving variable %s with value %s", UTF8_TO_TCHAR(Name.c_str()), *Value.ConvertToString());
return Value;
}

Expand Down
31 changes: 18 additions & 13 deletions Source/YarnSpinner/Private/Library/YarnCommandLibrary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
#include "Library/YarnCommandLibrary.h"

#include "DialogueRunner.h"
#include "AssetRegistry/ARFilter.h"
#include "AssetRegistry/AssetRegistryModule.h"
#include "Library/YarnLibraryRegistry.h"
#include "Misc/OutputDeviceNull.h"
#include "Misc/YSLogging.h"
#include "UObject/SoftObjectPtr.h"

Expand Down Expand Up @@ -69,10 +66,16 @@ void UYarnCommandLibrary::CallCommand(FName CommandName, TSoftObjectPtr<ADialogu
return ContinueDialogue(DialogueRunner);
}

#if ENGINE_MAJOR_VERSION >= 5
typedef FDoubleProperty NumericProperty;
#else
typedef FFloatProperty NumericProperty;
#endif

// Set up the parameters
FStructOnScope FuncParams(Function);
FBoolProperty* BoolParam;
FFloatProperty* FloatParam;
NumericProperty* NumericParam;
FStrProperty* StringParam;

const FName DialogueRunnerField = TEXT("DialogueRunner");
Expand All @@ -85,37 +88,39 @@ void UYarnCommandLibrary::CallCommand(FName CommandName, TSoftObjectPtr<ADialogu
// DialogueRunnerProperty->SetObjectPropertyValue_InContainer(FuncParams.GetStructMemory(), DialogueRunner);
// DialogueRunnerProperty->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), {DialogueRunner});

for (auto Arg : Args)
for (const FYarnBlueprintParam& Arg : Args)
{
// Set input properties
switch (Arg.Value.GetType())
{
case Yarn::Value::ValueType::BOOL:
case Yarn::FValue::EValueType::Bool:
BoolParam = CastField<FBoolProperty>(Function->FindPropertyByName(Arg.Name));
if (!BoolParam)
{
YS_WARN_FUNC("Could not create function parameter '%s' for command '%s' from given values", *Arg.Name.ToString(), *CommandName.ToString())
return ContinueDialogue(DialogueRunner);
}
BoolParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), Arg.Value.GetBooleanValue());
BoolParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), Arg.Value.GetValue<bool>());
break;
case Yarn::Value::ValueType::NUMBER:
FloatParam = CastField<FFloatProperty>(Function->FindPropertyByName(Arg.Name));
if (!FloatParam)
case Yarn::FValue::EValueType::Number:
NumericParam = CastField<NumericProperty>(Function->FindPropertyByName(Arg.Name));
if (!NumericParam)
{
YS_WARN_FUNC("Could not create function parameter '%s' for command '%s' from given values", *Arg.Name.ToString(), *CommandName.ToString())
return ContinueDialogue(DialogueRunner);
}
FloatParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), Arg.Value.GetNumberValue());
NumericParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), Arg.Value.GetValue<double>());
break;
case Yarn::Value::ValueType::STRING:
case Yarn::FValue::EValueType::String:
StringParam = CastField<FStrProperty>(Function->FindPropertyByName(Arg.Name));
if (!StringParam)
{
YS_WARN_FUNC("Could not create function parameter '%s' for command '%s' from given values", *Arg.Name.ToString(), *CommandName.ToString())
return ContinueDialogue(DialogueRunner);
}
StringParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), FString(Arg.Value.GetStringValue().c_str()));
StringParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), Arg.Value.GetValue<FString>());
break;
default:
break;
}
}
Expand Down
47 changes: 25 additions & 22 deletions Source/YarnSpinner/Private/Library/YarnFunctionLibrary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@

#include "Library/YarnFunctionLibrary.h"

#include "AssetRegistry/ARFilter.h"
#include "AssetRegistry/AssetRegistryModule.h"
#include "Library/YarnLibraryRegistry.h"
#include "Misc/OutputDeviceNull.h"
#include "Misc/YSLogging.h"


Expand Down Expand Up @@ -56,9 +53,9 @@ UYarnFunctionLibrary* UYarnFunctionLibrary::FromBlueprint(const UBlueprint* Blue
}


TOptional<Yarn::Value> UYarnFunctionLibrary::CallFunction(FName FunctionName, TArray<FYarnBlueprintParam> Args, TOptional<FYarnBlueprintParam> ReturnValue)
TOptional<Yarn::FValue> UYarnFunctionLibrary::CallFunction(FName FunctionName, TArray<FYarnBlueprintParam> Args, TOptional<FYarnBlueprintParam> ReturnValue)
{
TOptional<Yarn::Value> Result;
TOptional<Yarn::FValue> Result;

// Find the function
UFunction* Function = FindFunction(FunctionName);
Expand All @@ -69,43 +66,49 @@ TOptional<Yarn::Value> UYarnFunctionLibrary::CallFunction(FName FunctionName, TA
return Result;
}

#if ENGINE_MAJOR_VERSION >= 5
typedef FDoubleProperty NumericProperty;
#else
typedef FFloatProperty NumericProperty;
#endif

// Set up the parameters
FStructOnScope FuncParams(Function);
FBoolProperty* BoolParam;
FFloatProperty* FloatParam;
NumericProperty* NumericParam;
FStrProperty* StringParam;

for (auto Arg : Args)
{
// Set input properties
switch (Arg.Value.GetType())
{
case Yarn::Value::ValueType::BOOL:
case Yarn::FValue::EValueType::Bool:
BoolParam = CastField<FBoolProperty>(Function->FindPropertyByName(Arg.Name));
if (!BoolParam)
{
YS_WARN_FUNC("Could not create function parameter '%s' for function %s from given values", *Arg.Name.ToString(), *FunctionName.ToString())
return Result;
}
BoolParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), Arg.Value.GetBooleanValue());
BoolParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), Arg.Value.GetValue<bool>());
break;
case Yarn::Value::ValueType::NUMBER:
FloatParam = CastField<FFloatProperty>(Function->FindPropertyByName(Arg.Name));
if (!FloatParam)
case Yarn::FValue::EValueType::Number:
NumericParam = CastField<NumericProperty>(Function->FindPropertyByName(Arg.Name));
if (!NumericParam)
{
YS_WARN_FUNC("Could not create function parameter '%s' for function %s from given values", *Arg.Name.ToString(), *FunctionName.ToString())
return Result;
}
FloatParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), Arg.Value.GetNumberValue());
NumericParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), Arg.Value.GetValue<double>());
break;
case Yarn::Value::ValueType::STRING:
case Yarn::FValue::EValueType::String:
StringParam = CastField<FStrProperty>(Function->FindPropertyByName(Arg.Name));
if (!StringParam)
{
YS_WARN_FUNC("Could not create function parameter '%s' for function %s from given values", *Arg.Name.ToString(), *FunctionName.ToString())
return Result;
}
StringParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), FString(Arg.Value.GetStringValue().c_str()));
StringParam->SetPropertyValue_InContainer(FuncParams.GetStructMemory(), Arg.Value.GetValue<FString>());
break;
}
}
Expand All @@ -118,32 +121,32 @@ TOptional<Yarn::Value> UYarnFunctionLibrary::CallFunction(FName FunctionName, TA
{
switch (ReturnValue->Value.GetType())
{
case Yarn::Value::ValueType::BOOL:
case Yarn::FValue::EValueType::Bool:
BoolParam = CastField<FBoolProperty>(Function->FindPropertyByName(ReturnValue->Name));
if (!BoolParam)
{
YS_WARN_FUNC("Could not get return parameter '%s' for function '%s'", *ReturnValue->Name.ToString(), *FunctionName.ToString())
return Result;
}
Result = Yarn::Value(BoolParam->GetPropertyValue_InContainer(FuncParams.GetStructMemory()));
Result = Yarn::FValue(BoolParam->GetPropertyValue_InContainer(FuncParams.GetStructMemory()));
break;
case Yarn::Value::ValueType::NUMBER:
FloatParam = CastField<FFloatProperty>(Function->FindPropertyByName(ReturnValue->Name));
if (!FloatParam)
case Yarn::FValue::EValueType::Number:
NumericParam = CastField<NumericProperty>(Function->FindPropertyByName(ReturnValue->Name));
if (!NumericParam)
{
YS_WARN_FUNC("Could not get return parameter '%s' for function '%s'", *ReturnValue->Name.ToString(), *FunctionName.ToString())
return Result;
}
Result = Yarn::Value(FloatParam->GetPropertyValue_InContainer(FuncParams.GetStructMemory()));
Result = Yarn::FValue(NumericParam->GetPropertyValue_InContainer(FuncParams.GetStructMemory()));
break;
case Yarn::Value::ValueType::STRING:
case Yarn::FValue::EValueType::String:
StringParam = CastField<FStrProperty>(Function->FindPropertyByName(ReturnValue->Name));
if (!StringParam)
{
YS_WARN_FUNC("Could not get return parameter '%s' for function '%s'", *ReturnValue->Name.ToString(), *FunctionName.ToString())
return Result;
}
Result = Yarn::Value(TCHAR_TO_UTF8(*StringParam->GetPropertyValue_InContainer(FuncParams.GetStructMemory())));
Result = Yarn::FValue(TCHAR_TO_UTF8(*StringParam->GetPropertyValue_InContainer(FuncParams.GetStructMemory())));
break;
}
}
Expand Down
Loading