- updated for unreal version 5.5

rfsheffer · rfsheffer · commit 4e192daa599b · 2024-11-25T10:56:41.000-08:00
diff --git a/RyHelpfulHelpers.uplugin b/RyHelpfulHelpers.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.3",
+	"VersionName": "1.4",
 	"FriendlyName": "Ryan's Helpful Helpers",
 	"Description": "Extremely helpful helper functions for developing Blueprint and C++ projects in Unreal Engine.",
 	"Category": "Utilities",
diff --git a/Source/RyRuntime/Private/RyRuntimeComponentHelpers.cpp b/Source/RyRuntime/Private/RyRuntimeComponentHelpers.cpp
@@ -10,6 +10,11 @@
 #include "Runtime/Engine/Classes/PhysicsEngine/BodySetup.h"
 #include "Runtime/CoreUObject/Public/UObject/UObjectIterator.h"
 #include "Runtime/Engine/Classes/Components/PoseableMeshComponent.h"
+#include "Engine/SkeletalMesh.h"
+
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5)
+#include "PhysicsEngine/SkeletalBodySetup.h"
+#endif
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/Source/RyRuntime/Private/RyRuntimeLevelHelpers.cpp b/Source/RyRuntime/Private/RyRuntimeLevelHelpers.cpp
@@ -39,8 +39,11 @@ TSoftObjectPtr<UWorld> URyRuntimeLevelHelpers::GetWorldSoftReferenceFromPath(con
     {
         fileName = fileName.Left(levelInstStart);
     }
-    
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) || ENGINE_MAJOR_VERSION > 5
+    return TSoftObjectPtr<UWorld>(FSoftObjectPath(FString::Printf(TEXT("%s/%s.%s"), *fullFilePath, *fileName, *fileName)));
+#else
     return TSoftObjectPtr<UWorld>(FString::Printf(TEXT("%s/%s.%s"), *fullFilePath, *fileName, *fileName));
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -133,7 +136,11 @@ TSoftObjectPtr<UWorld> URyRuntimeLevelHelpers::GetCleanWorldSoftReference(const
         }
     }
 
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) || ENGINE_MAJOR_VERSION > 5
+    return TSoftObjectPtr<UWorld>(FSoftObjectPath(worldRefPath));
+#else
     return TSoftObjectPtr<UWorld>(worldRefPath);
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -738,7 +745,11 @@ ULevelStreamingDynamic* URyRuntimeLevelHelpers::LoadLevelInstance_Internal(UWorl
 
     if (ShortPackageName.StartsWith(World->StreamingLevelsPrefix))
     {
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) || ENGINE_MAJOR_VERSION > 5
+        ShortPackageName.RightChopInline(World->StreamingLevelsPrefix.Len(), EAllowShrinking::No);
+#else
         ShortPackageName.RightChopInline(World->StreamingLevelsPrefix.Len(), false);
+#endif
     }
 
     // Remove PIE prefix if it's there before we actually load the level
diff --git a/Source/RyRuntime/Private/RyRuntimeLogHelpers.cpp b/Source/RyRuntime/Private/RyRuntimeLogHelpers.cpp
@@ -14,6 +14,7 @@
 #include "Misc/FileHelper.h"
 #include "GenericPlatform/GenericPlatformOutputDevices.h"
 #include "Runtime/Engine/Classes/Engine/GameViewportClient.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
@@ -31,7 +32,11 @@ void URyRuntimeLogHelpers::PrintLogString(UObject* WorldContextObject, const FSt
             switch(World->GetNetMode())
             {
                 case NM_Client:
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) || ENGINE_MAJOR_VERSION > 5
+                    Prefix = FString::Printf(TEXT("Client %d: "), UE::GetPlayInEditorID() - 1);
+#else
                     Prefix = FString::Printf(TEXT("Client %d: "), GPlayInEditorID - 1);
+#endif
                     break;
                 case NM_DedicatedServer:
                 case NM_ListenServer:
diff --git a/Source/RyRuntime/Private/RyRuntimePlatformHelpers.cpp b/Source/RyRuntime/Private/RyRuntimePlatformHelpers.cpp
@@ -8,6 +8,9 @@
 #include "HAL/PlatformApplicationMisc.h"
 #include "GameFramework/WorldSettings.h"
 
+#include "Misc/App.h"
+#include "Engine/Engine.h"
+
 #if PLATFORM_ANDROID && USE_ANDROID_JNI
 #include "Android/AndroidJNI.h"
 #include "Android/AndroidApplication.h"
diff --git a/Source/RyRuntime/Private/RyRuntimeStringHelpers.cpp b/Source/RyRuntime/Private/RyRuntimeStringHelpers.cpp
@@ -6,6 +6,7 @@
 #include "Internationalization/StringTableCore.h"
 #include "Internationalization/StringTableRegistry.h"
 #include "Misc/Paths.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
@@ -62,7 +63,11 @@ void URyRuntimeStringHelpers::PopChar(FString& sourceString)
     {
         return;
     }
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) || ENGINE_MAJOR_VERSION > 5
+    sourceString.RemoveAt(sourceString.Len() - 1, 1, EAllowShrinking::No);
+#else
     sourceString.RemoveAt(sourceString.Len() - 1, 1, false);
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/Source/RyRuntime/Public/RyRuntimeArrayHelpers.h b/Source/RyRuntime/Public/RyRuntimeArrayHelpers.h
@@ -4,6 +4,8 @@
 
 #include "CoreMinimal.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
+#include "Runtime/Launch/Resources/Version.h"
+
 #include "RyRuntimeArrayHelpers.generated.h"
 
 //DECLARE_DYNAMIC_DELEGATE_RetVal_TwoParams(bool, FRyGenericArraySort, const int32&, A, const int32&, B);
@@ -43,7 +45,11 @@ class RYRUNTIME_API URyRuntimeArrayHelpers : public UBlueprintFunctionLibrary
 		// Since 'Item' isn't really an int, step the stack manually
 		// We use the array inner type to understand what we are returning (the size)
 		const FProperty* InnerProp = ArrayProperty->Inner;
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) || ENGINE_MAJOR_VERSION > 5
+		const int32 PropertySize = InnerProp->GetElementSize() * InnerProp->ArrayDim;
+#else
 		const int32 PropertySize = InnerProp->ElementSize * InnerProp->ArrayDim;
+#endif
 		void* StorageSpace = FMemory_Alloca(PropertySize);
 		InnerProp->InitializeValue(StorageSpace);
 
@@ -84,7 +90,11 @@ class RYRUNTIME_API URyRuntimeArrayHelpers : public UBlueprintFunctionLibrary
 		// Since 'Item' isn't really an int, step the stack manually
 		// We use the array inner type to understand what we are returning (the size)
 		const FProperty* InnerProp = ArrayProperty->Inner;
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) || ENGINE_MAJOR_VERSION > 5
+		const int32 PropertySize = InnerProp->GetElementSize() * InnerProp->ArrayDim;
+#else
 		const int32 PropertySize = InnerProp->ElementSize * InnerProp->ArrayDim;
+#endif
 		void* StorageSpace = FMemory_Alloca(PropertySize);
 		InnerProp->InitializeValue(StorageSpace);
 
diff --git a/Source/RyRuntime/Public/RyRuntimePlatformHelpers.h b/Source/RyRuntime/Public/RyRuntimePlatformHelpers.h
@@ -613,15 +613,19 @@ FORCEINLINE void URyRuntimePlatformHelpers::CustomNamedStat(const FString& Text,
 */
 FORCEINLINE void URyRuntimePlatformHelpers::BeginProfilerColor(const FColor& Color)
 {
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5) || ENGINE_MAJOR_VERSION < 5
 	FPlatformMisc::BeginProfilerColor(Color);
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
 */
 FORCEINLINE void URyRuntimePlatformHelpers::EndProfilerColor()
 {
+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5) || ENGINE_MAJOR_VERSION < 5
 	FPlatformMisc::EndProfilerColor();
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"FileVersion": 3,`
`3`	`3`	`"Version": 1,`
`4`		`- "VersionName": "1.3",`
	`4`	`+ "VersionName": "1.4",`
`5`	`5`	`"FriendlyName": "Ryan's Helpful Helpers",`
`6`	`6`	`"Description": "Extremely helpful helper functions for developing Blueprint and C++ projects in Unreal Engine.",`
`7`	`7`	`"Category": "Utilities",`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,11 @@ TSoftObjectPtr<UWorld> URyRuntimeLevelHelpers::GetWorldSoftReferenceFromPath(con`
`39`	`39`	`{`
`40`	`40`	`fileName = fileName.Left(levelInstStart);`
`41`	`41`	`}`
`42`		`-`
	`42`	`+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) \|\| ENGINE_MAJOR_VERSION > 5`
	`43`	`+ return TSoftObjectPtr<UWorld>(FSoftObjectPath(FString::Printf(TEXT("%s/%s.%s"), fullFilePath, fileName, *fileName)));`
	`44`	`+#else`
`43`	`45`	`return TSoftObjectPtr<UWorld>(FString::Printf(TEXT("%s/%s.%s"), fullFilePath, fileName, *fileName));`
	`46`	`+#endif`
`44`	`47`	`}`
`45`	`48`
`46`	`49`	`//---------------------------------------------------------------------------------------------------------------------`
`@@ -133,7 +136,11 @@ TSoftObjectPtr<UWorld> URyRuntimeLevelHelpers::GetCleanWorldSoftReference(const`
`133`	`136`	`}`
`134`	`137`	`}`
`135`	`138`
	`139`	`+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) \|\| ENGINE_MAJOR_VERSION > 5`
	`140`	`+ return TSoftObjectPtr<UWorld>(FSoftObjectPath(worldRefPath));`
	`141`	`+#else`
`136`	`142`	`return TSoftObjectPtr<UWorld>(worldRefPath);`
	`143`	`+#endif`
`137`	`144`	`}`
`138`	`145`
`139`	`146`	`//---------------------------------------------------------------------------------------------------------------------`
`@@ -738,7 +745,11 @@ ULevelStreamingDynamic* URyRuntimeLevelHelpers::LoadLevelInstance_Internal(UWorl`
`738`	`745`
`739`	`746`	`if (ShortPackageName.StartsWith(World->StreamingLevelsPrefix))`
`740`	`747`	`{`
	`748`	`+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) \|\| ENGINE_MAJOR_VERSION > 5`
	`749`	`+ ShortPackageName.RightChopInline(World->StreamingLevelsPrefix.Len(), EAllowShrinking::No);`
	`750`	`+#else`
`741`	`751`	`ShortPackageName.RightChopInline(World->StreamingLevelsPrefix.Len(), false);`
	`752`	`+#endif`
`742`	`753`	`}`
`743`	`754`
`744`	`755`	`// Remove PIE prefix if it's there before we actually load the level`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`#include "Internationalization/StringTableCore.h"`
`7`	`7`	`#include "Internationalization/StringTableRegistry.h"`
`8`	`8`	`#include "Misc/Paths.h"`
	`9`	`+#include "Runtime/Launch/Resources/Version.h"`
`9`	`10`
`10`	`11`	`//---------------------------------------------------------------------------------------------------------------------`
`11`	`12`	`/**`
`@@ -62,7 +63,11 @@ void URyRuntimeStringHelpers::PopChar(FString& sourceString)`
`62`	`63`	`{`
`63`	`64`	`return;`
`64`	`65`	`}`
	`66`	`+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5) \|\| ENGINE_MAJOR_VERSION > 5`
	`67`	`+ sourceString.RemoveAt(sourceString.Len() - 1, 1, EAllowShrinking::No);`
	`68`	`+#else`
`65`	`69`	`sourceString.RemoveAt(sourceString.Len() - 1, 1, false);`
	`70`	`+#endif`
`66`	`71`	`}`
`67`	`72`
`68`	`73`	`//---------------------------------------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -613,15 +613,19 @@ FORCEINLINE void URyRuntimePlatformHelpers::CustomNamedStat(const FString& Text,`
`613`	`613`	`*/`
`614`	`614`	`FORCEINLINE void URyRuntimePlatformHelpers::BeginProfilerColor(const FColor& Color)`
`615`	`615`	`{`
	`616`	`+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5) \|\| ENGINE_MAJOR_VERSION < 5`
`616`	`617`	`FPlatformMisc::BeginProfilerColor(Color);`
	`618`	`+#endif`
`617`	`619`	`}`
`618`	`620`
`619`	`621`	`//---------------------------------------------------------------------------------------------------------------------`
`620`	`622`	`/**`
`621`	`623`	`*/`
`622`	`624`	`FORCEINLINE void URyRuntimePlatformHelpers::EndProfilerColor()`
`623`	`625`	`{`
	`626`	`+#if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 5) \|\| ENGINE_MAJOR_VERSION < 5`
`624`	`627`	`FPlatformMisc::EndProfilerColor();`
	`628`	`+#endif`
`625`	`629`	`}`
`626`	`630`
`627`	`631`	`//---------------------------------------------------------------------------------------------------------------------`