PopcornFX Plugin v2.15.1

PopcornFX · Jan 27, 2023 · 02ec322 · 02ec322
1 parent 4b1ee1b
commit 02ec322
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 18 deletions.
diff --git a/Download_SDK_Desktop.bat b/Download_SDK_Desktop.bat
@@ -6,7 +6,7 @@ setlocal
 
 bitsadmin /reset
 bitsadmin /create third_party_download_desktop
-bitsadmin /addfile third_party_download_desktop https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.15.0_Win64_Linux64_Mac64.7z "%~dp0\_PopcornFX_Runtime_SDK_Desktop.7z"
+bitsadmin /addfile third_party_download_desktop https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.15.1_Win64_Linux64_Mac64.7z "%~dp0\_PopcornFX_Runtime_SDK_Desktop.7z"
 bitsadmin /setpriority third_party_download_desktop "FOREGROUND"
 bitsadmin /resume third_party_download_desktop
 

diff --git a/Download_SDK_Mobile.bat b/Download_SDK_Mobile.bat
@@ -6,7 +6,7 @@ setlocal
 
 bitsadmin /reset
 bitsadmin /create third_party_download_mobile
-bitsadmin /addfile third_party_download_mobile https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.15.0_iOS_Android.7z "%~dp0\_PopcornFX_Runtime_SDK_Mobile.7z"
+bitsadmin /addfile third_party_download_mobile https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.15.1_iOS_Android.7z "%~dp0\_PopcornFX_Runtime_SDK_Mobile.7z"
 bitsadmin /setpriority third_party_download_mobile "FOREGROUND"
 bitsadmin /resume third_party_download_mobile
 

diff --git a/PopcornFX.uplugin b/PopcornFX.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 21500,
-	"VersionName": "2.15.0",
+	"Version": 21501,
+	"VersionName": "2.15.1",
 	"FriendlyName": "PopcornFX",
 	"Description": "PopcornFX Realtime Particle Solution integration into Unreal Engine",
 	"Category": "PopcornFX",

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Unreal Engine PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unreal Engine 4** and **Unreal Engine 5** as a Plugin.
-* **Version:** `v2.15.0`
-* **Unreal Engine:** `4.27` and `5.1`
+* **Version:** `v2.15.1`
+* **Unreal Engine:** `4.27`, `5.0` and `5.1`
 * **Supported platforms:** `Windows`, `MacOS`, `Linux`, `iOS`, `Android`, `PS4`, `PS5`, `XboxOne`, `Xbox Series`, `Switch`
 
 [Contact-us](http://www.popcornfx.com/contact-us/) to request access to the plugin for consoles.

diff --git a/Shaders/Private/PopcornFXVertexFactory.ush b/Shaders/Private/PopcornFXVertexFactory.ush
@@ -40,7 +40,9 @@ struct FVertexFactoryInput
 #if FEATURE_LEVEL >= FEATURE_LEVEL_SM4 && ONEPASS_POINTLIGHT_SHADOW && USING_VERTEX_SHADER_LAYER
 	uint	InstanceId	: SV_InstanceID;
 #else
+#	if (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1)
 	VF_INSTANCED_STEREO_DECLARE_INPUT_BLOCK()
+#	endif // (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1)
 #endif
 	uint	VertexId : SV_VertexID;
 };

diff --git a/Source/PopcornFX/PopcornFX.Build.cs b/Source/PopcornFX/PopcornFX.Build.cs
@@ -300,15 +300,15 @@ private bool			SetupPopcornFX(TargetInfo Target)
 #endif // !UE_5_0_OR_LATER
 			else if (Target.Platform == UnrealTargetPlatform.Android)
 			{
-				// Multiple Architectures ! (armeabi, arm64)
-				// Using PublicLibraryPaths so ld will "skipping incompatible" libraries
-				// FIXME: UE Build will not watch for lib changes to relink
-
 				processLibs = false;
 				foreach (string lib in PkLibs)
 				{
-					PublicAdditionalLibraries.Add(clientLibDir + "gmake_android/lib" + lib + "_" + configShort + ".a");     // armv7a (armeabi)
-					PublicAdditionalLibraries.Add(clientLibDir + "gmake_android64/lib" + lib + "_" + configShort + ".a");   // armv8a (arm64)
+#if !UE_5_0_OR_LATER // armv7 dropped with UE5
+					// Multiple Architectures ! (armeabi, arm64)
+					// Using PublicLibraryPaths so ld will "skipping incompatible" libraries
+					PublicAdditionalLibraries.Add(clientLibDir + "gmake_android/lib" + lib + "_" + configShort + ".a");     // armv7 (armeabi)
+#endif
+					PublicAdditionalLibraries.Add(clientLibDir + "gmake_android64/lib" + lib + "_" + configShort + ".a");   // armv8 (arm64)
 				}
 				libPrefix = "";
 				libExt = "";

diff --git a/Source/PopcornFX/Private/Assets/PopcornFXEffect.cpp b/Source/PopcornFX/Private/Assets/PopcornFXEffect.cpp
@@ -840,11 +840,6 @@ bool	UPopcornFXEffect::_BakeFile(const FString &srcFilePath, FString &outBakedFi
 	else
 		bakeConfig->SetBakeMode(FPopcornFXPlugin::Get().SettingsEditor()->bDebugBakedEffects ? PopcornFX::COvenBakeConfig_HBO::Bake_SaveAsText : PopcornFX::COvenBakeConfig_HBO::Bake_SaveAsBinary); // "Final" bake when cooking: store as binary
 
-#if 1
-	// Temp: Disable VRP optim pass as it's broken in 2.9.13
-	bakeConfig->SetCompilerSwitches("--no-ins-vrp");
-#endif
-
 	// build versions
 	PopcornFX::COvenBakeConfig_Particle::_TypeOfBuildVersions	buildVersions;
 	buildVersions = targetBuildVersions;

diff --git a/Source/PopcornFX/Public/PopcornFXVersionGenerated.h b/Source/PopcornFX/Public/PopcornFXVersionGenerated.h
@@ -7,5 +7,5 @@
 
 #define POPCORNFX_PLUGIN_VERSION_MAJOR 2
 #define POPCORNFX_PLUGIN_VERSION_MINOR 15
-#define POPCORNFX_PLUGIN_VERSION_PATCH 0
+#define POPCORNFX_PLUGIN_VERSION_PATCH 1
 #define POPCORNFX_PLUGIN_VERSION_TAG ""