PopcornFX Gem 2.20.4

PopcornFX · Nov 22, 2024 · 8563830 · 8563830
1 parent 5ef47a4
commit 8563830
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 21 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.20.3)
+set(POPCORNFX_VERSION 2.20.4)
 set(POPCORNFX_LICENSE O3DE)
 
 o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${gem_restricted_path}" "${gem_path}" "${gem_name}")

diff --git a/Code/Platform/Linux/PAL_linux.cmake b/Code/Platform/Linux/PAL_linux.cmake
@@ -6,12 +6,12 @@
 set(LY_PACKAGE_SERVER_URLS ${LY_PACKAGE_SERVER_URLS} "https://downloads.popcornfx.com/o3de-packages")
 if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
 	set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux)
-	set(pk_package_hash 77420e60a2f83e2965cd0ff0955141e4626a4bf0ee20b7d2ed09e1c4a12bf600)
-	set(pk_package_id V1cOibNwsQpr1zPe)
+	set(pk_package_hash e856127f75f9d8db718aa8361be15646e86061a6d343eb3e42366d338095041b)
+	set(pk_package_id DXKEqC0oqzPEkVAl)
 elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
 	set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux-aarch64)
-	set(pk_package_hash 44e9f8e443424f748a02c930119ee2c38d69b2f22d989c6ab68ee470850db2bc)
-	set(pk_package_id KGX0lcH92TLXi1sE)
+	set(pk_package_hash 9daa4c7af8afcfac58b7de3157f10fce1220b8d5bf96680d4259a544354c3cf7)
+	set(pk_package_id AtLcf1FV1OsVZVQj)
 else()
 	message(FATAL_ERROR "Unsupported linux architecture ${CMAKE_SYSTEM_PROCESSOR}")
 endif()

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 ba90baac903ad79ba926248c368ee59ab1fb469137d18c967edc5a7db2453044)
-set(pk_package_id ggoMTTeWltRAo9yX)
+set(pk_package_hash f9219f7794168a538c6554c27e32fbc9c0def095b516e2dfe0b7bcca6b854ee6)
+set(pk_package_id v8CtwvWARBcJHnpZ)
 
 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 c997bf21024cdcb2c43719f7dceb9875b3b36ad62a96038f8a058ab1cc9e6a9b)
-set(pk_package_id PO6bALianyFhG8VX)
+set(pk_package_hash 1c9066a32206f75bb3ffba6c5a4298b755e9c2893c0528bd412d1487bee0b1ff)
+set(pk_package_id H2ruZV3Lrac66Mo2)
 
 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/Render/AtomIntegration/ParticleBuffers.cpp b/Code/Source/Integration/Render/AtomIntegration/ParticleBuffers.cpp
@@ -48,9 +48,6 @@ namespace PopcornFX {
 		sizeof(float), // GenBuffer_ParticleRotation
 		sizeof(CFloat3), // GenBuffer_ParticleAxis0
 		sizeof(CFloat3), // GenBuffer_ParticleAxis1
-		sizeof(CFloat3), // GenBuffer_ParticlePosition0
-		sizeof(CFloat3), // GenBuffer_ParticlePosition1
-		sizeof(CFloat3), // GenBuffer_ParticlePosition2
 	};
 
 	PK_STATIC_ASSERT(PK_ARRAY_COUNT(CParticleBuffers::kBufferStrides) == CParticleBuffers::__GenBuffer_Count);

diff --git a/Code/Source/Integration/Render/AtomIntegration/ParticleBuffers.h b/Code/Source/Integration/Render/AtomIntegration/ParticleBuffers.h
@@ -61,17 +61,14 @@ class	CParticleBuffers
 		GenBuffer_ParticleRotation,
 		GenBuffer_ParticleAxis0,
 		GenBuffer_ParticleAxis1,
-		GenBuffer_ParticlePosition0,
-		GenBuffer_ParticlePosition1,
-		GenBuffer_ParticlePosition2,
 
 		__GenBuffer_Count
 	};
 
 	// Element sizes:
 	static const u32	kBufferStrides[];
 
-	PK_STATIC_ASSERT(TIntegerTemplateTools::Log2<Drawers::GenInput_ParticlePosition2>::Value + 1 == __GenBuffer_Count);
+	PK_STATIC_ASSERT(TIntegerTemplateTools::Log2<Drawers::GenInput_ParticleAxis1>::Value + 1 == __GenBuffer_Count);
 
 	struct	SViewIndependent
 	{

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.20.3`
+* **Version:** `v2.20.4`
 * **O3DE:** `23.05`, `23.10`, `24.09`
 * **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.20.3",
+    "display_name": "PopcornFX 2.20.4",
     "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.20/O3DE_PopcornFXGem_v2.20.3_Win64_Linux64_LinuxARM64_Mac64.zip",
-    "version": "2.20.3",
-    "last_updated": "2024-10-24",
+    "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.20/O3DE_PopcornFXGem_v2.20.4_Win64_Linux64_LinuxARM64_Mac64.zip",
+    "version": "2.20.4",
+    "last_updated": "2024-11-22",
     "type": "Code",
     "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.",
     "canonical_tags": [