diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt index b988d84..9f5b5db 100644 --- a/Code/CMakeLists.txt +++ b/Code/CMakeLists.txt @@ -3,7 +3,7 @@ # https://www.popcornfx.com/terms-and-conditions/ #---------------------------------------------------------------------------- -set(POPCORNFX_VERSION 2.20.2) +set(POPCORNFX_VERSION 2.20.3) 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 index 9cac285..d540e5f 100644 --- 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 f154096ceee3268e5b6894d8bab56b9a335cf32cfbca5def50ecea9031c41658) - set(pk_package_id 1QdGMQ1JWwhurfqD) + set(pk_package_hash 77420e60a2f83e2965cd0ff0955141e4626a4bf0ee20b7d2ed09e1c4a12bf600) + set(pk_package_id V1cOibNwsQpr1zPe) elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux-aarch64) - set(pk_package_hash f154096ceee3268e5b6894d8bab56b9a335cf32cfbca5def50ecea9031c41658_ARM64) - set(pk_package_id 1QdGMQ1JWwhurfqD_ARM64) + set(pk_package_hash 44e9f8e443424f748a02c930119ee2c38d69b2f22d989c6ab68ee470850db2bc) + set(pk_package_id KGX0lcH92TLXi1sE) 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 index 140dec4..cd119a9 100644 --- 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 a7598f23cceae600cfcfa8a68bdf5b7dc41d01a60c355228ad8d60da20e1f528) -set(pk_package_id y5KQOjPw7QBbBG5T) +set(pk_package_hash ba90baac903ad79ba926248c368ee59ab1fb469137d18c967edc5a7db2453044) +set(pk_package_id ggoMTTeWltRAo9yX) 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/PopcornFXPackages.cmake b/Code/Platform/PopcornFXPackages.cmake index 92861fc..185a40d 100644 --- a/Code/Platform/PopcornFXPackages.cmake +++ b/Code/Platform/PopcornFXPackages.cmake @@ -76,7 +76,8 @@ function(pk_force_download_package package_name package_id) endfunction() function(pk_download_package_ifn package_name package_id) - if ("${package_id}" STREQUAL "POPCORNFXPACKAGEIDTOREPLACE") + string(FIND "${package_id}" "POPCORNFXPACKAGEIDTOREPLACE" out) + if ("${out}" EQUAL 0) return() endif() ly_validate_package(${package_name}) diff --git a/Code/Platform/Windows/PAL_windows.cmake b/Code/Platform/Windows/PAL_windows.cmake index 158b7a3..198f515 100644 --- 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 2e1d99d52adba4002e90d798e456613281ccb55e039869059decdb2e3e6b24b2) -set(pk_package_id oX1jNyQLOcVw3ViZ) +set(pk_package_hash c997bf21024cdcb2c43719f7dceb9875b3b36ad62a96038f8a058ab1cc9e6a9b) +set(pk_package_id PO6bALianyFhG8VX) 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 index 11c15f5..0582f96 100644 --- 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.20.2` -* **O3DE:** `23.05`, `23.10` +* **Version:** `v2.20.3` +* **O3DE:** `23.05`, `23.10`, `24.09` * **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 index 6179a31..0d05add 100644 --- a/gem.json +++ b/gem.json @@ -1,13 +1,13 @@ { "gem_name": "PopcornFX", - "display_name": "PopcornFX 2.20.2", + "display_name": "PopcornFX 2.20.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.20/O3DE_PopcornFXGem_v2.20.2_Win64_Linux64_LinuxARM64_Mac64.zip", - "version": "2.20.2", - "last_updated": "2024-10-07", + "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", "type": "Code", "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.", "canonical_tags": [