PopcornFX Gem 2.15.3

PopcornFX · Feb 24, 2023 · 6d483fd · 6d483fd
1 parent 655019e
commit 6d483fd
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 12 deletions.
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.2)
+set(POPCORNFX_VERSION 2.15.3)
 set(POPCORNFX_LICENSE O3DE)
 
 if (PK_O3DE_MAJOR_VERSION GREATER_EQUAL 2205)
@@ -131,11 +131,17 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
         NAME PopcornFX.Builders GEM_MODULE
         NAMESPACE Gem
+        AUTOUIC
+        AUTOMOC
+        AUTORCC
         FILES_CMAKE
             popcornfx_builder_files.cmake
+            popcornfx_editor_files.cmake # Note: pipeline tools need access to editor components in order to process .prefabs
         COMPILE_DEFINITIONS
             PRIVATE
+                QT_NO_KEYWORDS
                 POPCORNFX_BUILDER
+                POPCORNFX_EDITOR
         INCLUDE_DIRECTORIES
             PRIVATE
                 Source

diff --git a/Code/Include/PopcornFX/PopcornFXBus.h b/Code/Include/PopcornFX/PopcornFXBus.h
@@ -430,8 +430,13 @@ namespace PopcornFX
 	};
 	using PopcornFXEmitterEditorComponentEventsBus = AZ::EBus <PopcornFXEmitterEditorComponentEvents>;
 
+#if PK_O3DE_MAJOR_VERSION > 2210
+	static constexpr AZ::Uuid EmitterComponentTypeId = AZ::Uuid("{515957e3-8354-4048-8d6c-98628ef21804}");
+	static constexpr AZ::Uuid EditorEmitterComponentTypeId = AZ::Uuid("{B62ED02E-731B-4ACD-BCA1-78EF92528228}");
+#else
 	static const AZ::Uuid EmitterComponentTypeId = AZ::Uuid("{515957e3-8354-4048-8d6c-98628ef21804}");
 	static const AZ::Uuid EditorEmitterComponentTypeId = AZ::Uuid("{B62ED02E-731B-4ACD-BCA1-78EF92528228}");
+#endif
 
 	class PopcornFXProfilerRequests
 		: public AZ::EBusTraits

diff --git a/Code/Platform/Linux/PAL_linux.cmake b/Code/Platform/Linux/PAL_linux.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}-linux)
-set(pk_package_hash f0fe3b09556832eb59c737e99e8f18d395aab8cc9b2790c7ecdd4dba74d22b1b)
-set(pk_package_id sRBWQzKHD4Y5yUKF)
+set(pk_package_hash 92cdd0675546d56ae30511da7e689f179b62e91064bc9f8f9b86c9f34ec72a52)
+set(pk_package_id WAyVE9npfW6LezRL)
 
 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 b2b5ac75bb0357bb245fd60e54a7cd9a5b7ac65d9d4ef56e06aaaa82231ccbfd)
-set(pk_package_id wkYRZm3NjraDHkrJ)
+set(pk_package_hash 3b86f2a24940622897a51bc54875a0cc88f4d653ac6738357fba9d98b71b0c35)
+set(pk_package_id Dx8Bumnv6JMPHTyx)
 
 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 66a38432be94020a8cae3e6eacbc7b79ba5426f40f17820572517a2ffdb20449)
-set(pk_package_id NQNXvs2hcxA97cZb)
+set(pk_package_hash 52ae35d50236bce4f18c68ff25f7a666bb5c3dfdf7171255316738ecf0eea8e8)
+set(pk_package_id Fy4x9kVx86NYPu8Y)
 
 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/README.md b/README.md
@@ -1,7 +1,7 @@
 # O3DE PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **O3DE** as a Gem.
-* **Version:** `v2.15.2`
+* **Version:** `v2.15.3`
 * **O3DE:** `21.11`, `21.11.2`, `22.05.0`, `22.10.0`
 * **Supported platforms:** `Windows`, `MacOS`, `Linux`, `iOS`, `Android`
 

diff --git a/gem.json b/gem.json
@@ -1,13 +1,13 @@
 {
     "gem_name": "PopcornFX",
-    "display_name": "PopcornFX 2.15.2",
+    "display_name": "PopcornFX 2.15.3",
     "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.2_Win64_Linux64_Mac64.zip",
-    "version": "2.15.2",
-    "last_updated": "2023-02-09",
+    "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.15/O3DE_PopcornFXGem_v2.15.3_Win64_Linux64_Mac64.zip",
+    "version": "2.15.3",
+    "last_updated": "2023-02-23",
     "type": "Code",
     "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.",
     "canonical_tags": [