- Upgraded for unreal 5.6

Author: rfsheffer

RyHelpfulHelpers.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.4",
+	"VersionName": "1.5",
 	"FriendlyName": "Ryan's Helpful Helpers",
 	"Description": "Extremely helpful helper functions for developing Blueprint and C++ projects in Unreal Engine.",
 	"Category": "Utilities",

Source/RyRuntime/Private/RyRuntimeRenderingHelpers.cpp

@@ -59,10 +59,18 @@ ERyShaderPlatform URyRuntimeRenderingHelpers::GetShaderPlatform(UObject* WorldCo
 	{
 	case SP_PCD3D_SM5:
 		return ERyShaderPlatform::SP_PCD3D_SM5;
+#if ENGINE_MAJOR_VERSION < 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6)
 	case SP_METAL:
 		return ERyShaderPlatform::SP_METAL;
 	case SP_METAL_MRT:
 		return ERyShaderPlatform::SP_METAL_MRT;
+#endif
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 6)
+	case SP_METAL_ES3_1_IOS:
+		return ERyShaderPlatform::SP_METAL_ES3_1_IOS;
+	case SP_METAL_SM5_IOS:
+		return ERyShaderPlatform::SP_METAL_SM5_IOS;
+#endif
 	case SP_PCD3D_ES3_1:
 		return ERyShaderPlatform::SP_PCD3D_ES3_1;
 	case SP_OPENGL_PCES3_1:
@@ -79,22 +87,32 @@ ERyShaderPlatform URyRuntimeRenderingHelpers::GetShaderPlatform(UObject* WorldCo
 		return ERyShaderPlatform::SP_VULKAN_SM5;
 	case SP_VULKAN_ES3_1_ANDROID:
 		return ERyShaderPlatform::SP_VULKAN_ES3_1_ANDROID;
+#if ENGINE_MAJOR_VERSION < 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6)
 	case SP_METAL_MACES3_1:
 		return ERyShaderPlatform::SP_METAL_MACES3_1;
-	case SP_OPENGL_ES3_1_ANDROID:
-		return ERyShaderPlatform::SP_OPENGL_ES3_1_ANDROID;
 	case SP_METAL_MRT_MAC:
 		return ERyShaderPlatform::SP_METAL_MRT_MAC;
+#endif
+	case SP_OPENGL_ES3_1_ANDROID:
+		return ERyShaderPlatform::SP_OPENGL_ES3_1_ANDROID;
 #if ENGINE_MAJOR_VERSION < 5
 	case SP_VULKAN_SM5_LUMIN:
 		return ERyShaderPlatform::SP_VULKAN_SM5_LUMIN;
 	case SP_VULKAN_ES3_1_LUMIN:
 		return ERyShaderPlatform::SP_VULKAN_ES3_1_LUMIN;
 #endif
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 6)
+	case SP_METAL_ES3_1_TVOS:
+		return ERyShaderPlatform::SP_METAL_ES3_1_TVOS;
+	case SP_METAL_SM5_TVOS:
+		return ERyShaderPlatform::SP_METAL_SM5_TVOS;
+	#endif
+#if ENGINE_MAJOR_VERSION < 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6)
 	case SP_METAL_TVOS:
 		return ERyShaderPlatform::SP_METAL_TVOS;
 	case SP_METAL_MRT_TVOS:
 		return ERyShaderPlatform::SP_METAL_MRT_TVOS;
+#endif
 	case SP_VULKAN_SM5_ANDROID:
 		return ERyShaderPlatform::SP_VULKAN_SM5_ANDROID;
 #if ENGINE_MAJOR_VERSION >= 5
@@ -104,6 +122,15 @@ ERyShaderPlatform URyRuntimeRenderingHelpers::GetShaderPlatform(UObject* WorldCo
 	case SP_D3D_ES3_1_HOLOLENS:
 		return ERyShaderPlatform::SP_D3D_ES3_1_HOLOLENS;
 #endif
+#endif
+
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 6)
+	case SP_VULKAN_SM6:
+		return ERyShaderPlatform::SP_VULKAN_SM6;
+	case SP_METAL_SM6:
+		return ERyShaderPlatform::SP_METAL_SM6;
+	case SP_METAL_SIM:
+		return ERyShaderPlatform::SP_METAL_SIM;
 #endif
 	default: ;
 	}

Source/RyRuntime/Public/RyRuntimeMathHelpers.h

@@ -74,6 +74,9 @@ enum class ERyUnit : uint8
 	Candela UMETA(Hidden),
 	Lux UMETA(Hidden),
 	CandelaPerMeter2 UMETA(Hidden),
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 6)
+	Nit UMETA(Hidden),
+#endif
 #if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 3)
 	ExposureValue UMETA(Hidden),
 #endif

Source/RyRuntime/Public/RyRuntimeRenderingHelpers.h

@@ -13,8 +13,14 @@ enum class ERyShaderPlatform : uint8
 {
 	SP_INVALID UMETA(DisplayName="INVALID"),
 	SP_PCD3D_SM5 UMETA(DisplayName="PCD3D SM5"),
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 6)
+	SP_METAL_ES3_1_IOS UMETA(DisplayName="METAL ES3.1 IOS"),
+	SP_METAL_SM5_IOS UMETA(DisplayName="METAL SM5 IOS"),
+#endif
+#if ENGINE_MAJOR_VERSION < 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6)
 	SP_METAL UMETA(DisplayName="METAL"),
 	SP_METAL_MRT UMETA(DisplayName="METAL MRT"),
+#endif
 	SP_PCD3D_ES3_1 UMETA(DisplayName="PCD3D ES3.1"),
 	SP_OPENGL_PCES3_1 UMETA(DisplayName="OPENGL PCES3.1"),
 	SP_METAL_SM5 UMETA(DisplayName="METAL SM5"),
@@ -24,22 +30,36 @@ enum class ERyShaderPlatform : uint8
 #endif
 	SP_VULKAN_SM5 UMETA(DisplayName="VULKAN SM5"),
 	SP_VULKAN_ES3_1_ANDROID UMETA(DisplayName="VULKAN ES3.1 ANDROID"),
+#if ENGINE_MAJOR_VERSION < 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6)
 	SP_METAL_MACES3_1 UMETA(DisplayName="METAL MACES3.1"),
-	SP_OPENGL_ES3_1_ANDROID UMETA(DisplayName="OPENGL ES3.1 ANDROID"),
 	SP_METAL_MRT_MAC UMETA(DisplayName="METAL MRT MAC"),
+#endif
+	SP_OPENGL_ES3_1_ANDROID UMETA(DisplayName="OPENGL ES3.1 ANDROID"),
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 6)
+	SP_METAL_ES3_1_TVOS,
+	SP_METAL_SM5_TVOS,
+#endif
 #if ENGINE_MAJOR_VERSION < 5
 	SP_VULKAN_SM5_LUMIN UMETA(DisplayName="VULKAN SM5 LUMIN"),
 	SP_VULKAN_ES3_1_LUMIN UMETA(DisplayName="VULKAN ES3.1 LUMIN"),
 #endif
+#if ENGINE_MAJOR_VERSION < 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6)
 	SP_METAL_TVOS UMETA(DisplayName="METAL TVOS"),
 	SP_METAL_MRT_TVOS UMETA(DisplayName="METAL MRT TVOS"),
+#endif
 	SP_VULKAN_SM5_ANDROID UMETA(DisplayName="VULKAN SM5 ANDROID"),
 #if ENGINE_MAJOR_VERSION >= 5
 	SP_PCD3D_SM6 UMETA(DisplayName="PCD3D SM6"),
 #if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 3
 	SP_D3D_ES3_1_HOLOLENS UMETA(DisplayName="D3D ES3.1 HOLOLENS"),
 #endif
 #endif
+
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 6)
+	SP_VULKAN_SM6 UMETA(DisplayName="VULKAN SM6"),
+	SP_METAL_SM6 UMETA(DisplayName="METAL SM6"),
+	SP_METAL_SIM UMETA(DisplayName="METAL SIM"),
+#endif
 };
 
 UENUM(Blueprintable)