From 1fe9ca34cf930ad4687130dc28df2518c0fad5b1 Mon Sep 17 00:00:00 2001 From: Valentin Bas Date: Thu, 27 Jul 2023 16:31:03 +0200 Subject: [PATCH] PopcornFX Gem 2.17.3 --- Code/CMakeLists.txt | 2 +- Code/Platform/Linux/PAL_linux.cmake | 4 ++-- Code/Platform/Mac/PAL_mac.cmake | 4 ++-- Code/Platform/Windows/PAL_windows.cmake | 4 ++-- .../Attributes/TrackView/PopcornFXTrackViewAttribute.cpp | 2 +- README.md | 2 +- gem.json | 8 ++++---- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt index 6194e2a..afde2e8 100644 --- a/Code/CMakeLists.txt +++ b/Code/CMakeLists.txt @@ -3,7 +3,7 @@ # https://www.popcornfx.com/terms-and-conditions/ #---------------------------------------------------------------------------- -set(POPCORNFX_VERSION 2.17.2) +set(POPCORNFX_VERSION 2.17.3) 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 index 862a89c..018f436 100644 --- 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 21aa148e997c765bf3069b83c9b4a31bffa8b5c9a5e6144285ab0150c915fdfc) -set(pk_package_id cVJu5D7zMx9vVCCp) +set(pk_package_hash 0624bf8ff38bce909fbedede6647990d527c8f11ada08000cdd535fc8c2ee121) +set(pk_package_id 2pEhBPX228JQwwAQ) 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 index 9a57118..bec0fd4 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 b3d0614805fca662b44600d37c264d11f7bb36284aa3aaba418281f6e5e44220) -set(pk_package_id eUWQXBhmjDZQ2dQT) +set(pk_package_hash 1e25b413d31924e3519a021821f52572d15f8a2c85955487c5d075699ee279cf) +set(pk_package_id t2bfL4avtPu8KAbM) 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 index 8814f90..107c0c6 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 02d3aeca554576c5078f05192bb14899a232e9b87ddbe50614f2127ea613dff9) -set(pk_package_id hZ2q9uWpG5sJtJWZ) +set(pk_package_hash 6a4ba23f55b82566fe21a24a52f0fdf74a437c122f20d6b27cbe4768edb4635f) +set(pk_package_id WSvfjAt7pMzJneFL) 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/Components/Attributes/TrackView/PopcornFXTrackViewAttribute.cpp b/Code/Source/Components/Attributes/TrackView/PopcornFXTrackViewAttribute.cpp index ebc2632..5274711 100644 --- a/Code/Source/Components/Attributes/TrackView/PopcornFXTrackViewAttribute.cpp +++ b/Code/Source/Components/Attributes/TrackView/PopcornFXTrackViewAttribute.cpp @@ -322,7 +322,7 @@ namespace PopcornFX { AZ::Color PopcornFXTrackViewAttribute::GetValueColor() const { - AZ::Color value; + AZ::Color value = AZ::Colors::HotPink; if (!AttributeValid()) return value; PopcornFX::PopcornFXEmitterComponentRequestBus::EventResult(value, m_ParentId, &PopcornFX::PopcornFXEmitterComponentRequests::GetAttributeAsColor, m_AttributeId); diff --git a/README.md b/README.md index cc311d4..d212c8f 100644 --- 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.17.2` +* **Version:** `v2.17.3` * **O3DE:** `21.11`, `21.11.2`, `22.05.0`, `22.10.0`, `23.03.0` * **Supported platforms:** `Windows`, `MacOS`, `Linux`, `iOS`, `Android` diff --git a/gem.json b/gem.json index ce0efbb..d4928d2 100644 --- a/gem.json +++ b/gem.json @@ -1,13 +1,13 @@ { "gem_name": "PopcornFX", - "display_name": "PopcornFX 2.17.2", + "display_name": "PopcornFX 2.17.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.17/O3DE_PopcornFXGem_v2.17.2_Win64_Linux64_Mac64.zip", - "version": "2.17.2", - "last_updated": "2023-07-12", + "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.17/O3DE_PopcornFXGem_v2.17.3_Win64_Linux64_Mac64.zip", + "version": "2.17.3", + "last_updated": "2023-07-27", "type": "Code", "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.", "canonical_tags": [