PopcornFX Gem 2.15.14

PopcornFX · Sep 27, 2023 · 49a3b48 · 49a3b48
1 parent afce292
commit 49a3b48
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 15 deletions.
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
@@ -25,6 +25,6 @@ jobs:
         with:
           draft: true
           name: "O3DE Plugin: ${{ github.ref_name }}"
-          body: "PopcornFX Plugin v${{ github.ref_name }} for O3DE\n
+          body: "PopcornFX Plugin ${{ github.ref_name }} for O3DE\n\n
                 You can download the PopcornFX Editor and find the full changelog here:\n
                 https://wiki.popcornfx.com/index.php?title=PK-Editor_${{ env.MINOR_VERSION }}#Changelog_${{ env.VERSION }}"
diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt
@@ -3,7 +3,7 @@
 # https://www.popcornfx.com/terms-and-conditions/
 #----------------------------------------------------------------------------
 
-set(POPCORNFX_VERSION 2.15.13)
+set(POPCORNFX_VERSION 2.15.14)
 set(POPCORNFX_LICENSE O3DE)
 
 if (PK_O3DE_MAJOR_VERSION GREATER_EQUAL 2205)

diff --git a/Code/Platform/Linux/PAL_linux.cmake b/Code/Platform/Linux/PAL_linux.cmake
@@ -4,9 +4,17 @@
 #----------------------------------------------------------------------------
 
 set(LY_PACKAGE_SERVER_URLS ${LY_PACKAGE_SERVER_URLS} "https://downloads.popcornfx.com/o3de-packages")
-set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux)
-set(pk_package_hash 55485e8e5623fbbf3de7e4dcd37c02606f394ff6df82c5b9f40e5b46d27fa5d2)
-set(pk_package_id raV2xapGQu9NvRt3)
+if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+	set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux)
+	set(pk_package_hash 7083eebe6a5a21dd40bd2f38824a8b28b1ead391bd7cc52c6d36e2df59ed91f6)
+	set(pk_package_id nNmxfK8MrGPqWgtm)
+elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+	set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux-aarch64)
+	set(pk_package_hash 7083eebe6a5a21dd40bd2f38824a8b28b1ead391bd7cc52c6d36e2df59ed91f6_ARM64)
+	set(pk_package_id nNmxfK8MrGPqWgtm_ARM64)
+else()
+	message(FATAL_ERROR "Unsupported linux architecture ${CMAKE_SYSTEM_PROCESSOR}")
+endif()
 
 ly_associate_package(PACKAGE_NAME ${package_name} TARGETS PopcornFX PACKAGE_HASH ${pk_package_hash})
 pk_download_package_ifn(${package_name} ${pk_package_id})

diff --git a/Code/Platform/Mac/PAL_mac.cmake b/Code/Platform/Mac/PAL_mac.cmake
@@ -5,8 +5,8 @@
 
 set(LY_PACKAGE_SERVER_URLS ${LY_PACKAGE_SERVER_URLS} "https://downloads.popcornfx.com/o3de-packages")
 set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-mac)
-set(pk_package_hash 3fbd6cfaf5c797232ab8baac9050219574bb5c528ed9ba83262ea8710e5a34cf)
-set(pk_package_id 8ywFLnXSqvKghunB)
+set(pk_package_hash 34ac88830921d4027e769b640f915c1e18f7c426fa223d33e1b61b2458c1fef5)
+set(pk_package_id 5wTMrDbLZVc2u7VE)
 
 ly_associate_package(PACKAGE_NAME ${package_name} TARGETS PopcornFX PACKAGE_HASH ${pk_package_hash})
 pk_download_package_ifn(${package_name} ${pk_package_id})

diff --git a/Code/Platform/Windows/PAL_windows.cmake b/Code/Platform/Windows/PAL_windows.cmake
@@ -5,8 +5,8 @@
 
 set(LY_PACKAGE_SERVER_URLS ${LY_PACKAGE_SERVER_URLS} "https://downloads.popcornfx.com/o3de-packages")
 set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-windows)
-set(pk_package_hash f14af52d7f43720f44f988d62f36a14d6495daca6fef4fbc9a4f21ea045c45ed)
-set(pk_package_id CcKLXs9DpRysFj2p)
+set(pk_package_hash 8103753c8b990696755b8616e2784b43ea293b691acfddce7dac91c2c96e4cba)
+set(pk_package_id 4PG9PxsadR4BnTZA)
 
 ly_associate_package(PACKAGE_NAME ${package_name} TARGETS PopcornFX PACKAGE_HASH ${pk_package_hash})
 pk_download_package_ifn(${package_name} ${pk_package_id})

diff --git a/Code/Source/Integration/Editor/BakerManager.cpp b/Code/Source/Integration/Editor/BakerManager.cpp
@@ -177,7 +177,11 @@ bool	CBakerManager::Activate()
 				PK_VERIFY(extensionsRemap.PushBack(CString("tif=tif.streamingimage")).Valid()) &&
 				PK_VERIFY(extensionsRemap.PushBack(CString("tiff=tiff.streamingimage")).Valid()) &&
 				PK_VERIFY(extensionsRemap.PushBack(CString("dds=dds.streamingimage")).Valid()) &&
+#if PK_O3DE_MAJOR_VERSION > 2305
+				PK_VERIFY(extensionsRemap.PushBack(CString("fbx=fbx.azmodel")).Valid()))
+#else
 				PK_VERIFY(extensionsRemap.PushBack(CString("fbx=azmodel")).Valid()))
+#endif
 			{
 				config->SetExtensionsRemap(extensionsRemap);
 			}
@@ -214,7 +218,9 @@ AZStd::string	CBakerManager::BakeSingleAsset(const AZStd::string &assetPath, con
 	CLog::Log(PK_INFO, "Baking effect '%s'", virtualPath.Data());
 
 	const bool	bakeOk = m_Cookery->BakeAsset(virtualPath, m_Cookery->m_BaseConfigFile, bakerMessages, dstPackPaths);
+#if (PK_MESSAGE_STREAM_NO_MESSAGES == 0)
 	LogBakerMessages(bakerMessages);
+#endif
 	if (!bakeOk)
 	{
 		CLog::Log(PK_ERROR, "Failed baking effect '%s'", virtualPath.Data());
@@ -290,6 +296,7 @@ bool	CBakerManager::GatherDependencies(const AZStd::string &assetPath, AZStd::ve
 	return true;
 }
 
+#if (PK_MESSAGE_STREAM_NO_MESSAGES == 0)
 void	CBakerManager::LogBakerMessages(const CMessageStream &messages)
 {
 	PopcornFX::TArray<CString>	messageLines;
@@ -315,6 +322,7 @@ void	CBakerManager::LogBakerMessages(const CMessageStream &messages)
 		}
 	}
 }
+#endif // (PK_MESSAGE_STREAM_NO_MESSAGES == 0)
 
 bool	CBakerManager::_SetPackIFN(const AZStd::string &assetPath, CWindManager &windManager)
 {

diff --git a/Code/Source/Integration/Editor/BakerManager.h b/Code/Source/Integration/Editor/BakerManager.h
@@ -59,7 +59,9 @@ class CBakerManager
 		bool	Initialize();
 	};
 
+#if (PK_MESSAGE_STREAM_NO_MESSAGES == 0)
 	void	LogBakerMessages(const CMessageStream &messages);
+#endif
 	bool	_SetPackIFN(const AZStd::string &assetPath, CWindManager &windManager);
 	void	_SetBuildVersion(const AZStd::string &platform);
 

diff --git a/Code/Source/ScriptCanvas/PopcornFXBroadcastNodeable.h b/Code/Source/ScriptCanvas/PopcornFXBroadcastNodeable.h
@@ -25,6 +25,8 @@ namespace PopcornFX
 		SCRIPTCANVAS_NODE(PopcornFXBroadcastNodeable)
 
 	public:
+		AZ_CLASS_ALLOCATOR(PopcornFXBroadcastNodeable, AZ::SystemAllocator)
+
 		PopcornFXBroadcastNodeable() = default;
 		virtual ~PopcornFXBroadcastNodeable();
 		PopcornFXBroadcastNodeable(const PopcornFXBroadcastNodeable&) = default;

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # O3DE PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **O3DE** as a Gem.
-* **Version:** `v2.15.13`
-* **O3DE:** `21.11`, `21.11.2`, `22.05.0`, `22.10.0`, `23.03.0`
+* **Version:** `v2.15.14`
+* **O3DE:** `23.05`
 * **Supported platforms:** `Windows`, `MacOS`, `Linux`, `iOS`, `Android`
 
 **Note:** Mobile platforms are in an experimental stage. [Contact-us](http://www.popcornfx.com/contact-us/) to request access.

diff --git a/gem.json b/gem.json
@@ -1,13 +1,13 @@
 {
     "gem_name": "PopcornFX",
-    "display_name": "PopcornFX 2.15.13",
+    "display_name": "PopcornFX 2.15.14",
     "license": "Community",
     "license_url": "https://www.popcornfx.com/popcornfx-community-license",
     "origin": "Persistant Studios - popcornfx.com",
     "repo_uri": "https://downloads.popcornfx.com/o3de-repo",
-    "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.15/O3DE_PopcornFXGem_v2.15.13_Win64_Linux64_Mac64.zip",
-    "version": "2.15.13",
-    "last_updated": "2023-08-31",
+    "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.15/O3DE_PopcornFXGem_v2.15.14_Win64_Linux64_LinuxARM64_Mac64.zip",
+    "version": "2.15.14",
+    "last_updated": "2023-09-27",
     "type": "Code",
     "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.",
     "canonical_tags": [