diff --git a/BlueprintSorting.uplugin b/BlueprintSorting.uplugin index 62e3dd6..618b899 100644 --- a/BlueprintSorting.uplugin +++ b/BlueprintSorting.uplugin @@ -18,7 +18,7 @@ [ { "Name" : "BlueprintSorting", - "Type" : "Developer", + "Type" : "DeveloperTool", "LoadingPhase" : "PreDefault" } ] diff --git a/Source/BlueprintSorting/BlueprintSorting.Build.cs b/Source/BlueprintSorting/BlueprintSorting.Build.cs index 695a135..4860726 100644 --- a/Source/BlueprintSorting/BlueprintSorting.Build.cs +++ b/Source/BlueprintSorting/BlueprintSorting.Build.cs @@ -3,21 +3,9 @@ public class BlueprintSorting : ModuleRules { - public BlueprintSorting(TargetInfo Target) + public BlueprintSorting(ReadOnlyTargetRules Target) : base(Target) { - PublicIncludePaths.AddRange( - new string[] { - "BlueprintSorting/Public", - // ... add public include paths required here ... - } - ); - - PrivateIncludePaths.AddRange( - new string[] { - "BlueprintSorting/Private", - // ... add other private include paths required here ... - } - ); + PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs; PublicDependencyModuleNames.AddRange( new string[] @@ -25,7 +13,6 @@ public BlueprintSorting(TargetInfo Target) "Core", "CoreUObject", "Engine", - // ... add other public dependencies that you statically link with here ... } ); @@ -38,17 +25,7 @@ public BlueprintSorting(TargetInfo Target) "GraphEditor", "UnrealEd", "Kismet", - // ... add private dependencies that you statically link with here ... } ); - - DynamicallyLoadedModuleNames.AddRange( - new string[] - { - // ... add any modules that your module loads dynamically here ... - } - ); - - bEnforceIWYU = false; } } \ No newline at end of file diff --git a/Source/BlueprintSorting/Private/BPCHandler_BaseSortArray.cpp b/Source/BlueprintSorting/Private/BPCHandler_BaseSortArray.cpp index 11e7402..56d8f5d 100644 --- a/Source/BlueprintSorting/Private/BPCHandler_BaseSortArray.cpp +++ b/Source/BlueprintSorting/Private/BPCHandler_BaseSortArray.cpp @@ -1,8 +1,8 @@ -#include "CoreMinimal.h" - #include "BPCHandler_BaseSortArray.h" #include "BPNode_BaseSortArray.h" #include "BlueprintSortingHelperLibrary.h" + +#include "CoreMinimal.h" #include "Engine/Blueprint.h" #include "Engine/MemberReference.h" #include "BlueprintActionDatabaseRegistrar.h" diff --git a/Source/BlueprintSorting/Private/BPCHandler_BubbleSortArray.cpp b/Source/BlueprintSorting/Private/BPCHandler_BubbleSortArray.cpp index b70f418..0aa1c93 100644 --- a/Source/BlueprintSorting/Private/BPCHandler_BubbleSortArray.cpp +++ b/Source/BlueprintSorting/Private/BPCHandler_BubbleSortArray.cpp @@ -49,7 +49,7 @@ void BPCHandler_BubbleSortArray::CompileSort(FKismetFunctionContext& Context, UE UEdGraphPin* ExecTriggeringPin = Context.FindRequiredPinByName(ArrayNode, UEdGraphSchema_K2::PN_Execute, EGPD_Input); if ((ExecTriggeringPin == NULL) || !Context.ValidatePinType(ExecTriggeringPin, ExpectedExecPinType)) { - CompilerContext.MessageLog.Error(*FString::Printf(*LOCTEXT("NoValidExecutionPinForSortArray_Error", "@@ must have a valid execution pin @@").ToString()), ArrayNode, ExecTriggeringPin); + CompilerContext.MessageLog.Error(*LOCTEXT("NoValidExecutionPinForSortArray_Error", "@@ must have a valid execution pin @@").ToString(), ArrayNode, ExecTriggeringPin); return; } @@ -57,7 +57,7 @@ void BPCHandler_BubbleSortArray::CompileSort(FKismetFunctionContext& Context, UE FBPTerminal* OrderingFunctionContext = FindFunctionContext(Context, Node); if(!OrderingFunction) { - CompilerContext.MessageLog.Error(*FString::Printf(*LOCTEXT("NoValidFunctionForSortArray_Error", "Unable to find a vaild sort function to call for @@").ToString()), ArrayNode); + CompilerContext.MessageLog.Error(*LOCTEXT("NoValidFunctionForSortArray_Error", "Unable to find a valid sort function to call for @@").ToString(), ArrayNode); return; } @@ -138,7 +138,7 @@ void BPCHandler_BubbleSortArray::CompileSort(FKismetFunctionContext& Context, UE MainLoopPtr = &MainLoop; } - // Assign inital no swaps monitor variable to true + // Assign initial no swaps monitor variable to true { FBPTerminal* LiteralTerm = Context.CreateLocalTerminal(ETerminalSpecification::TS_Literal); LiteralTerm->bIsLiteral = true; @@ -235,7 +235,7 @@ void BPCHandler_BubbleSortArray::CompileSort(FKismetFunctionContext& Context, UE Statement.RHS.Add(*DirectionTerm); } - // If if the first item should go after the second item then we will swap the elements and mark that a swap has been made + // If the first item should go after the second item then we will swap the elements and mark that a swap has been made // Otherwise jump this { FBlueprintCompiledStatement& JumpOverSwap = Context.AppendStatementForNode(Node); @@ -318,7 +318,7 @@ void BPCHandler_BubbleSortArray::CompileSort(FKismetFunctionContext& Context, UE JumpInnerLoopStart.TargetLabel = InnerLoopPtr; } - // If any swaps occured then jump back and check orderings of all adjacent pairs + // If any swaps occurred then jump back and check orderings of all adjacent pairs { FBlueprintCompiledStatement& JumpInnerLoopStart = Context.AppendStatementForNode(Node); JumpInnerLoopStart.Type = KCST_GotoIfNot; diff --git a/Source/BlueprintSorting/Private/BPNode_BaseSortArray.cpp b/Source/BlueprintSorting/Private/BPNode_BaseSortArray.cpp index 8061faf..ac54943 100644 --- a/Source/BlueprintSorting/Private/BPNode_BaseSortArray.cpp +++ b/Source/BlueprintSorting/Private/BPNode_BaseSortArray.cpp @@ -1,5 +1,5 @@ -#include "CoreMinimal.h" #include "BPNode_BaseSortArray.h" +#include "CoreMinimal.h" #include "BPCHandler_BubbleSortArray.h" #include "Engine/Blueprint.h" #include "Engine/MemberReference.h" @@ -22,13 +22,13 @@ struct FBPNode_BaseSortArrayHelper { - static FString DelegatePinName; - static FString ArrayPinName; - static FString SortDirectionPinName; + static FName DelegatePinName; + static FName ArrayPinName; + static FName SortDirectionPinName; }; -FString FBPNode_BaseSortArrayHelper::DelegatePinName(TEXT("Delegate")); -FString FBPNode_BaseSortArrayHelper::ArrayPinName(TEXT("Array")); -FString FBPNode_BaseSortArrayHelper::SortDirectionPinName(TEXT("Sort Direction")); +FName FBPNode_BaseSortArrayHelper::DelegatePinName(TEXT("Delegate")); +FName FBPNode_BaseSortArrayHelper::ArrayPinName(TEXT("Array")); +FName FBPNode_BaseSortArrayHelper::SortDirectionPinName(TEXT("Sort Direction")); UBPNode_BaseSortArray::UBPNode_BaseSortArray(const FObjectInitializer &ObjectInitializer) : Super(ObjectInitializer) @@ -56,7 +56,7 @@ void UBPNode_BaseSortArray::ValidateNodeDuringCompilation(class FCompilerResults if(ArrayPin->PinType.PinCategory == K2Schema->PC_Wildcard) { - MessageLog.Error(*FString::Printf(*NSLOCTEXT("K2Node", "BaseSortArrayNotAssignable", "Array input must have a type. Connect it to something. @@").ToString()), this); + MessageLog.Error(*NSLOCTEXT("K2Node", "BaseSortArrayNotAssignable", "Array input must have a type. Connect it to something. @@").ToString(), this); } else { @@ -74,14 +74,14 @@ void UBPNode_BaseSortArray::ValidateNodeDuringCompilation(class FCompilerResults } else { - TypeToSort = ArrayPin->PinType.PinCategory; + TypeToSort = ArrayPin->PinType.PinCategory.ToString(); } } else { - TypeToSort = ArrayPin->PinType.PinCategory; + TypeToSort = ArrayPin->PinType.PinCategory.ToString(); } - MessageLog.Error(*FString::Printf(*NSLOCTEXT("K2Node", "BaseSortArray_MissingSignature", "Signature is missing. Create a (dummy) event dispatcher with a signature of %s, %s, OrderingResult. @@").ToString(), *TypeToSort, *TypeToSort), this); + MessageLog.Error(*FString::Format(*NSLOCTEXT("K2Node", "BaseSortArray_MissingSignature", "Signature is missing. Create a (dummy) event dispatcher with a signature of {0}, {1}, OrderingResult. @@").ToString(), { *TypeToSort, *TypeToSort }), this); } } @@ -105,7 +105,7 @@ UK2Node::ERedirectType UBPNode_BaseSortArray::DoPinsMatchForReconstruction(const { if ((OldPin->PinType.PinCategory == K2Schema->PC_Delegate) && (NewPin->PinType.PinCategory == K2Schema->PC_Delegate) && - (FCString::Stricmp(*(NewPin->PinName), *(OldPin->PinName)) == 0)) + (NewPin->PinName == OldPin->PinName)) { return ERedirectType_Name; } @@ -119,14 +119,16 @@ void UBPNode_BaseSortArray::AllocateDefaultPins() const UEdGraphSchema_K2* K2Schema = GetDefault(); - CreatePin(EGPD_Input, K2Schema->PC_Exec, TEXT(""), NULL, false, false, K2Schema->PN_Execute); - CreatePin(EGPD_Output, K2Schema->PC_Exec, TEXT(""), NULL, false, false, K2Schema->PN_Then); + CreatePin(EGPD_Input, K2Schema->PC_Exec, TEXT(""), nullptr, K2Schema->PN_Execute); + CreatePin(EGPD_Output, K2Schema->PC_Exec, TEXT(""), nullptr, K2Schema->PN_Then); UEnum* EnumPtr = FindObject(ANY_PACKAGE, TEXT("ESortDirection"), true); - CreatePin(EGPD_Input, K2Schema->PC_Byte, TEXT(""), EnumPtr, false, false, FBPNode_BaseSortArrayHelper::SortDirectionPinName); + CreatePin(EGPD_Input, K2Schema->PC_Byte, TEXT(""), EnumPtr, FBPNode_BaseSortArrayHelper::SortDirectionPinName); GetSortDirectionPin()->DefaultValue = "Ascending"; - CreatePin(EGPD_Input, UEdGraphSchema_K2::PC_Wildcard, TEXT(""), NULL, true, false, FBPNode_BaseSortArrayHelper::ArrayPinName); + FCreatePinParams PinParams; + PinParams.ContainerType = EPinContainerType::Array; + CreatePin(EGPD_Input, UEdGraphSchema_K2::PC_Wildcard, FName(TEXT("")), nullptr, FBPNode_BaseSortArrayHelper::ArrayPinName, PinParams); } void UBPNode_BaseSortArray::ReallocatePinsDuringReconstruction(TArray& OldPins) @@ -150,7 +152,10 @@ void UBPNode_BaseSortArray::ReallocatePinsDuringReconstruction(TArray(); - auto DelegatePin = CreatePin(EGPD_Input, K2Schema->PC_Delegate, TEXT(""), NULL, false, true, FBPNode_BaseSortArrayHelper::DelegatePinName, true); + FCreatePinParams PinParams; + PinParams.bIsReference = true; + PinParams.bIsConst = true; + auto DelegatePin = CreatePin(EGPD_Input, K2Schema->PC_Delegate, TEXT(""), nullptr, FBPNode_BaseSortArrayHelper::DelegatePinName, PinParams); if (DelegatePin) { UFunction* SignatureFunction = GetSignatureFunction(ArrayPin->PinType); @@ -213,9 +218,9 @@ UFunction* UBPNode_BaseSortArray::GetSignatureFunction(FEdGraphPinType& PinType, return nullptr; } - for (TFieldIterator It(ClassToSearch); It; ++It) + for (TFieldIterator It(ClassToSearch); It; ++It) { - UMulticastDelegateProperty* DelProp = *It; + FMulticastDelegateProperty* DelProp = *It; if(!DelProp) { continue; @@ -235,7 +240,7 @@ UFunction* UBPNode_BaseSortArray::GetSignatureFunction(FEdGraphPinType& PinType, bool Relevant = true; int32 PropertyIndex = 0; - for (TFieldIterator PIt(Func); PIt; ++PIt, ++PropertyIndex) + for (TFieldIterator PIt(Func); PIt; ++PIt, ++PropertyIndex) { if (PIt->PropertyFlags & CPF_OutParm) { @@ -254,7 +259,7 @@ UFunction* UBPNode_BaseSortArray::GetSignatureFunction(FEdGraphPinType& PinType, if (PropertyIndex < 2) { - if (PropType.bIsArray || PropType.bIsMap || PropType.bIsSet) + if (PropType.ContainerType != EPinContainerType::None) { Relevant = false; break; @@ -281,7 +286,7 @@ UFunction* UBPNode_BaseSortArray::GetSignatureFunction(FEdGraphPinType& PinType, if (PropertyIndex == 2) { - if (PropType.bIsArray || PropType.bIsMap || PropType.bIsSet) + if (PropType.ContainerType != EPinContainerType::None) { Relevant = false; break; @@ -383,14 +388,14 @@ UFunction* UBPNode_BaseSortArray::GetFunction(FEdGraphPinType& PinType) const bool Relevant = true; int32 PropertyIndex = 0; - for (TFieldIterator PIt(*It); PIt; ++PIt, ++PropertyIndex) + for (TFieldIterator PIt(*It); PIt; ++PIt, ++PropertyIndex) { FEdGraphPinType PropType; K2Schema->ConvertPropertyToPinType(*PIt, PropType); if (PropertyIndex < 2) { - if (PropType.bIsArray || PropType.bIsMap || PropType.bIsSet) + if (PropType.ContainerType != EPinContainerType::None) { Relevant = false; break; @@ -414,7 +419,7 @@ UFunction* UBPNode_BaseSortArray::GetFunction(FEdGraphPinType& PinType) const if (PropertyIndex == 2) { - if (PropType.bIsArray || PropType.bIsMap || PropType.bIsSet) + if (PropType.ContainerType != EPinContainerType::None) { Relevant = false; break; @@ -449,7 +454,7 @@ bool UBPNode_BaseSortArray::AreSameSignatures(const UEdGraphSchema_K2* K2Schema, return false; } - for (TFieldIterator ItA(SigA), ItB(SigB); ItA, ItB; ++ItA, ++ItB) + for (TFieldIterator ItA(SigA), ItB(SigB); ItA, ItB; ++ItA, ++ItB) { FEdGraphPinType PropTypeA; FEdGraphPinType PropTypeB; @@ -482,7 +487,7 @@ void UBPNode_BaseSortArray::OnArrayPinChanged() FEdGraphPinType PinType = ArrayPin->LinkedTo[0]->PinType; ArrayPin->PinType = PinType; - ArrayPin->PinType.bIsArray = true; + ArrayPin->PinType.ContainerType = EPinContainerType::Array; ArrayPin->PinType.bIsReference = false; UBlueprint* Blueprint = GetBlueprint(); @@ -512,12 +517,15 @@ void UBPNode_BaseSortArray::OnArrayPinChanged() { if (DelegatePin) { - DelegatePin->MarkPendingKill(); + DelegatePin->MarkAsGarbage(); Pins.Remove(DelegatePin); OldClassPins.Add(DelegatePin); } - DelegatePin = CreatePin(EGPD_Input, K2Schema->PC_Delegate, TEXT(""), NULL, false, true, FBPNode_BaseSortArrayHelper::DelegatePinName, true); + FCreatePinParams PinParams; + PinParams.bIsConst = true; + PinParams.bIsReference = true; + DelegatePin = CreatePin(EGPD_Input, K2Schema->PC_Delegate, TEXT(""), nullptr, FBPNode_BaseSortArrayHelper::DelegatePinName, PinParams); if (DelegatePin) { FMemberReference::FillSimpleMemberReference(SignatureFunction, DelegatePin->PinType.PinSubCategoryMemberReference); @@ -531,7 +539,7 @@ void UBPNode_BaseSortArray::OnArrayPinChanged() if (DelegatePin) { - DelegatePin->MarkPendingKill(); + DelegatePin->MarkAsGarbage(); Pins.Remove(DelegatePin); OldClassPins.Add(DelegatePin); } @@ -541,13 +549,13 @@ void UBPNode_BaseSortArray::OnArrayPinChanged() { if (DelegatePin) { - DelegatePin->MarkPendingKill(); + DelegatePin->MarkAsGarbage(); Pins.Remove(DelegatePin); OldClassPins.Add(DelegatePin); } } - RewireOldPinsToNewPins(OldClassPins, NewClassPins); + RewireOldPinsToNewPins(OldClassPins, NewClassPins, nullptr); // Destroy the old pins DestroyPinList(OldClassPins); diff --git a/Source/BlueprintSorting/Private/BPNode_SortArray.cpp b/Source/BlueprintSorting/Private/BPNode_SortArray.cpp index 75f0d8d..85a8870 100644 --- a/Source/BlueprintSorting/Private/BPNode_SortArray.cpp +++ b/Source/BlueprintSorting/Private/BPNode_SortArray.cpp @@ -1,8 +1,9 @@ -#include "CoreMinimal.h" - #include "BPNode_SortArray.h" #include "BPCHandler_BubbleSortArray.h" +#include "CoreMinimal.h" + + #define LOCTEXT_NAMESPACE "BlueprintSorting" UBPNode_SortArray::UBPNode_SortArray(const FObjectInitializer &ObjectInitializer) diff --git a/Source/BlueprintSorting/Private/BlueprintSorting.cpp b/Source/BlueprintSorting/Private/BlueprintSorting.cpp index 97f28a1..95e2414 100644 --- a/Source/BlueprintSorting/Private/BlueprintSorting.cpp +++ b/Source/BlueprintSorting/Private/BlueprintSorting.cpp @@ -1,7 +1,7 @@ -#include "CoreMinimal.h" +#include "BlueprintSorting.h" +#include "CoreMinimal.h" #include "Modules/ModuleManager.h" -#include "BlueprintSorting.h" void BlueprintSorting::StartupModule() diff --git a/Source/BlueprintSorting/Private/BlueprintSortingHelperLibrary.cpp b/Source/BlueprintSorting/Private/BlueprintSortingHelperLibrary.cpp index 7906dc3..6d5b59d 100644 --- a/Source/BlueprintSorting/Private/BlueprintSortingHelperLibrary.cpp +++ b/Source/BlueprintSorting/Private/BlueprintSortingHelperLibrary.cpp @@ -1,8 +1,8 @@ -#include "CoreMinimal.h" - #include "BlueprintSortingHelperLibrary.h" -void UBlueprintSortingHelperLibrary::SwapItems_Impl(void* TargetArray, const UArrayProperty* ArrayProp, int32 Index1, int32 Index2) +#include "CoreMinimal.h" + +void UBlueprintSortingHelperLibrary::SwapItems_Impl(void* TargetArray, const FArrayProperty* ArrayProp, int32 Index1, int32 Index2) { if (TargetArray) { @@ -12,7 +12,7 @@ void UBlueprintSortingHelperLibrary::SwapItems_Impl(void* TargetArray, const UAr } } -bool UBlueprintSortingHelperLibrary::GreaterThanOrEqualArrayLength_Impl(void* TargetArray, const UArrayProperty* ArrayProp, int32 Index) +bool UBlueprintSortingHelperLibrary::GreaterThanOrEqualArrayLength_Impl(void* TargetArray, const FArrayProperty* ArrayProp, int32 Index) { if (TargetArray) { @@ -25,7 +25,7 @@ bool UBlueprintSortingHelperLibrary::GreaterThanOrEqualArrayLength_Impl(void* Ta return false; } -bool UBlueprintSortingHelperLibrary::LessThanOrEqualArrayLength_Impl(void* TargetArray, const UArrayProperty* ArrayProp, int32 Index) +bool UBlueprintSortingHelperLibrary::LessThanOrEqualArrayLength_Impl(void* TargetArray, const FArrayProperty* ArrayProp, int32 Index) { if (TargetArray) { diff --git a/Source/BlueprintSorting/Private/OrderingResult.cpp b/Source/BlueprintSorting/Private/OrderingResult.cpp index 24916d3..a7b45af 100644 --- a/Source/BlueprintSorting/Private/OrderingResult.cpp +++ b/Source/BlueprintSorting/Private/OrderingResult.cpp @@ -1,8 +1,8 @@ -#include "CoreMinimal.h" - #include "OrderingResult.h" #include "BPNode_BaseSortArray.h" +#include "CoreMinimal.h" + UOrderingResult::UOrderingResult( const FObjectInitializer& ObjectInitializer ) : Super( ObjectInitializer ) diff --git a/Source/BlueprintSorting/Public/BlueprintSortingHelperLibrary.h b/Source/BlueprintSorting/Public/BlueprintSortingHelperLibrary.h index 6346d97..48b798c 100644 --- a/Source/BlueprintSorting/Public/BlueprintSortingHelperLibrary.h +++ b/Source/BlueprintSorting/Public/BlueprintSortingHelperLibrary.h @@ -22,15 +22,15 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun UFUNCTION(CustomThunk) static void SwapItems(const TArray& TargetArray, int32& Index1, int32& Index2); - static void SwapItems_Impl(void* TargetArray, const UArrayProperty* ArrayProp, int32 Index1, int32 Index2); + static void SwapItems_Impl(void* TargetArray, const FArrayProperty* ArrayProp, int32 Index1, int32 Index2); UFUNCTION(CustomThunk) static bool GreaterThanOrEqualArrayLength(const TArray& TargetArray, int32& Index); - static bool GreaterThanOrEqualArrayLength_Impl(void* TargetArray, const UArrayProperty* ArrayProp, int32 Index); + static bool GreaterThanOrEqualArrayLength_Impl(void* TargetArray, const FArrayProperty* ArrayProp, int32 Index); UFUNCTION(CustomThunk) static bool LessThanOrEqualArrayLength(const TArray& TargetArray, int32& Index); - static bool LessThanOrEqualArrayLength_Impl(void* TargetArray, const UArrayProperty* ArrayProp, int32 Index); + static bool LessThanOrEqualArrayLength_Impl(void* TargetArray, const FArrayProperty* ArrayProp, int32 Index); UFUNCTION(CustomThunk) static void TestItem(int32& TargetItem); @@ -44,17 +44,17 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun DECLARE_FUNCTION(execSwapItems) { Stack.MostRecentProperty = nullptr; - Stack.StepCompiledIn(NULL); + Stack.StepCompiledIn(NULL); void* ArrayAddr = Stack.MostRecentPropertyAddress; - UArrayProperty* ArrayProperty = Cast(Stack.MostRecentProperty); + FArrayProperty* ArrayProperty = CastField(Stack.MostRecentProperty); if (!ArrayProperty) { Stack.bArrayContextFailed = true; return; } - P_GET_PROPERTY(UIntProperty, Index1); - P_GET_PROPERTY(UIntProperty, Index2); + P_GET_PROPERTY(FIntProperty, Index1); + P_GET_PROPERTY(FIntProperty, Index2); P_FINISH; P_NATIVE_BEGIN; @@ -65,16 +65,16 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun DECLARE_FUNCTION(execGreaterThanOrEqualArrayLength) { Stack.MostRecentProperty = nullptr; - Stack.StepCompiledIn(NULL); + Stack.StepCompiledIn(NULL); void* ArrayAddr = Stack.MostRecentPropertyAddress; - UArrayProperty* ArrayProperty = Cast(Stack.MostRecentProperty); + FArrayProperty* ArrayProperty = CastField(Stack.MostRecentProperty); if (!ArrayProperty) { Stack.bArrayContextFailed = true; return; } - P_GET_PROPERTY(UIntProperty, Index); + P_GET_PROPERTY(FIntProperty, Index); P_FINISH; P_NATIVE_BEGIN; @@ -85,16 +85,16 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun DECLARE_FUNCTION(execLessThanOrEqualArrayLength) { Stack.MostRecentProperty = nullptr; - Stack.StepCompiledIn(NULL); + Stack.StepCompiledIn(NULL); void* ArrayAddr = Stack.MostRecentPropertyAddress; - UArrayProperty* ArrayProperty = Cast(Stack.MostRecentProperty); + FArrayProperty* ArrayProperty = CastField(Stack.MostRecentProperty); if (!ArrayProperty) { Stack.bArrayContextFailed = true; return; } - P_GET_PROPERTY(UIntProperty, Index); + P_GET_PROPERTY(FIntProperty, Index); P_FINISH; P_NATIVE_BEGIN; @@ -105,9 +105,9 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun DECLARE_FUNCTION(execTestItem) { Stack.MostRecentProperty = nullptr; - Stack.StepCompiledIn(NULL); + Stack.StepCompiledIn(NULL); void* Property1Addr = Stack.MostRecentPropertyAddress; - UProperty* Property1 = Cast(Stack.MostRecentProperty); + FProperty* Property1 = CastField(Stack.MostRecentProperty); if (!Property1) { Stack.bArrayContextFailed = true; @@ -118,14 +118,14 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun P_NATIVE_BEGIN; FString OutText; - UObjectProperty* ObjProp = Cast(Property1); + FObjectProperty* ObjProp = CastField(Property1); if (ObjProp) { auto Obj = ObjProp->GetObjectPropertyValue(Property1Addr); int32 somethign = 932854; } - UIntProperty* IntProp = Cast(Property1); + FIntProperty* IntProp = CastField(Property1); if (IntProp) { auto Int = IntProp->GetSignedIntPropertyValue(Property1Addr); @@ -142,9 +142,9 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun DECLARE_FUNCTION(execTestTwoItems) { Stack.MostRecentProperty = nullptr; - Stack.StepCompiledIn(NULL); + Stack.StepCompiledIn(NULL); void* Property1Addr = Stack.MostRecentPropertyAddress; - UProperty* Property1 = Cast(Stack.MostRecentProperty); + FProperty* Property1 = CastField(Stack.MostRecentProperty); if (!Property1) { Stack.bArrayContextFailed = true; @@ -152,9 +152,9 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun } Stack.MostRecentProperty = nullptr; - Stack.StepCompiledIn(NULL); + Stack.StepCompiledIn(NULL); void* Property2Addr = Stack.MostRecentPropertyAddress; - UProperty* Property2 = Cast(Stack.MostRecentProperty); + FProperty* Property2 = CastField(Stack.MostRecentProperty); if (!Property2) { Stack.bArrayContextFailed = true; @@ -166,14 +166,14 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun FString OutText; { - UObjectProperty* ObjProp = Cast(Property1); + FObjectProperty* ObjProp = CastField(Property1); if (ObjProp) { auto Obj = ObjProp->GetObjectPropertyValue(Property1Addr); int32 somethign = 932854; } - UIntProperty* IntProp = Cast(Property1); + FIntProperty* IntProp = CastField(Property1); if (IntProp) { auto Int = IntProp->GetSignedIntPropertyValue(Property1Addr); @@ -182,14 +182,14 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun } { - UObjectProperty* ObjProp = Cast(Property2); + FObjectProperty* ObjProp = CastField(Property2); if (ObjProp) { auto Obj = ObjProp->GetObjectPropertyValue(Property2Addr); int32 somethign = 932854; } - UIntProperty* IntProp = Cast(Property2); + FIntProperty* IntProp = CastField(Property2); if (IntProp) { auto Int = IntProp->GetSignedIntPropertyValue(Property2Addr); @@ -206,9 +206,9 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun DECLARE_FUNCTION(execTestThreeItems) { Stack.MostRecentProperty = nullptr; - Stack.StepCompiledIn(NULL); + Stack.StepCompiledIn(NULL); void* Property1Addr = Stack.MostRecentPropertyAddress; - UProperty* Property1 = Cast(Stack.MostRecentProperty); + FProperty* Property1 = CastField(Stack.MostRecentProperty); if (!Property1) { Stack.bArrayContextFailed = true; @@ -216,9 +216,9 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun } Stack.MostRecentProperty = nullptr; - Stack.StepCompiledIn(NULL); + Stack.StepCompiledIn(NULL); void* Property2Addr = Stack.MostRecentPropertyAddress; - UProperty* Property2 = Cast(Stack.MostRecentProperty); + FProperty* Property2 = CastField(Stack.MostRecentProperty); if (!Property2) { Stack.bArrayContextFailed = true; @@ -226,9 +226,9 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun } Stack.MostRecentProperty = nullptr; - Stack.StepCompiledIn(NULL); + Stack.StepCompiledIn(NULL); void* Property3Addr = Stack.MostRecentPropertyAddress; - UProperty* Property3 = Cast(Stack.MostRecentProperty); + FProperty* Property3 = CastField(Stack.MostRecentProperty); if (!Property3) { Stack.bArrayContextFailed = true; @@ -240,14 +240,14 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun FString OutText; { - UObjectProperty* ObjProp = Cast(Property1); + FObjectProperty* ObjProp = CastField(Property1); if (ObjProp) { auto Obj = ObjProp->GetObjectPropertyValue(Property1Addr); int32 somethign = 932854; } - UIntProperty* IntProp = Cast(Property1); + FIntProperty* IntProp = CastField(Property1); if (IntProp) { auto Int = IntProp->GetSignedIntPropertyValue(Property1Addr); @@ -256,14 +256,14 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun } { - UObjectProperty* ObjProp = Cast(Property2); + FObjectProperty* ObjProp = CastField(Property2); if (ObjProp) { auto Obj = ObjProp->GetObjectPropertyValue(Property2Addr); int32 somethign = 932854; } - UIntProperty* IntProp = Cast(Property2); + FIntProperty* IntProp = CastField(Property2); if (IntProp) { auto Int = IntProp->GetSignedIntPropertyValue(Property2Addr); @@ -272,14 +272,14 @@ class BLUEPRINTSORTING_API UBlueprintSortingHelperLibrary : public UBlueprintFun } { - UObjectProperty* ObjProp = Cast(Property3); + FObjectProperty* ObjProp = CastField(Property3); if (ObjProp) { auto Obj = ObjProp->GetObjectPropertyValue(Property3Addr); int32 somethign = 932854; } - UIntProperty* IntProp = Cast(Property3); + FIntProperty* IntProp = CastField(Property3); if (IntProp) { auto Int = IntProp->GetSignedIntPropertyValue(Property3Addr);