PopcornFX Gem 2.18.6

PopcornFX · Mar 28, 2024 · 1ac2112 · 1ac2112
1 parent b659742
commit 1ac2112
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 14 deletions.
diff --git a/Assets/shaders/Common/LightingHelper.azsli b/Assets/shaders/Common/LightingHelper.azsli
@@ -98,7 +98,11 @@ ForwardPassOutput 	ComputeParticleLighting(float3 worldPosition,
 
     // Light iterator
     lightingData.tileIterator.Init(position, PassSrg::m_lightListRemapped, PassSrg::m_tileLightData);
+#if PK_O3DE_LIT_MULTI_VIEW
+    lightingData.Init(surface.position, surface.normal, surface.roughnessLinear, ViewSrg::m_worldPosition.xyz);
+#else
     lightingData.Init(surface.position, surface.normal, surface.roughnessLinear);
+#endif
 
 #if !PK_O3DE_NEW_LIT
     // Directional light shadow coordinates

diff --git a/Assets/shaders/Common/PopcornOptions.azsli b/Assets/shaders/Common/PopcornOptions.azsli
@@ -7,4 +7,5 @@
 
 #define PK_O3DE_NEW_LIT 1
 #define PK_O3DE_NEW_PBR 1
+#define PK_O3DE_LIT_MULTI_VIEW 0
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -92,6 +92,14 @@ if(DEFINED O3DE_VERSION_MAJOR)
         message(VERBOSE "Activating PopcornFX gem for O3DE ${PK_O3DE_MAJOR_VERSION}")
         ly_enable_gems(GEMS PopcornFX)
     endif()
+
+    # 23.05 had the display version in version property
+    if(NOT (O3DE_VERSION_MAJOR EQUAL 23 AND O3DE_VERSION_MINOR EQUAL 05))
+        # Apply patches here IFN
+        if(O3DE_VERSION_MAJOR GREATER_EQUAL 4)
+            pk_patch_file("PK_O3DE_LIT_MULTI_VIEW 0" "PK_O3DE_LIT_MULTI_VIEW 1" ${gem_path}/Assets/shaders/Common/PopcornOptions.azsli)
+        endif()
+    endif()
 endif()
 
 if (PK_O3DE_MAJOR_VERSION GREATER 2210)

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.18.5)
+set(POPCORNFX_VERSION 2.18.6)
 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
@@ -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 00749183c22216da7f1d932a1971c095ba25f4c3624f215e934597bf036b7675)
-	set(pk_package_id JgiBFr77fVSdmate)
+	set(pk_package_hash b0295eca1edeb01eeff59697b317946f98b992c3d040e0343c24feeb7d7ad1f6)
+	set(pk_package_id ydXuX23Oq5b82XC2)
 elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
 	set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux-aarch64)
-	set(pk_package_hash 00749183c22216da7f1d932a1971c095ba25f4c3624f215e934597bf036b7675_ARM64)
-	set(pk_package_id JgiBFr77fVSdmate_ARM64)
+	set(pk_package_hash b0295eca1edeb01eeff59697b317946f98b992c3d040e0343c24feeb7d7ad1f6_ARM64)
+	set(pk_package_id ydXuX23Oq5b82XC2_ARM64)
 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 653544ee81c265f135b7a2c59915f30d8d1b7fccde467760651125f4d2d6df78)
-set(pk_package_id 1AHmWajFaqK8AyZS)
+set(pk_package_hash 9513d1d0ac3b6c2c6468d16540189a773ebebf370c5b55c74a6cfb63ab1814ad)
+set(pk_package_id 524rU2tRcNpTPvss)
 
 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 411cd153b193e4205f83c9a92a729ea1535fba1addeee8952079bb36d39fe707)
-set(pk_package_id fDK4vBTTvgY7xebt)
+set(pk_package_hash 3cd0958bf36f4ada75cd46120be94f6a92ce7b8d0c7829919081107433df08cc)
+set(pk_package_id LfE6ZMS827USLbCP)
 
 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.18.5`
+* **Version:** `v2.18.6`
 * **O3DE:** `23.05`, `23.10`
 * **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.18.5",
+    "display_name": "PopcornFX 2.18.6",
     "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.18/O3DE_PopcornFXGem_v2.18.5_Win64_Linux64_LinuxARM64_Mac64.zip",
-    "version": "2.18.5",
-    "last_updated": "2024-02-08",
+    "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.18/O3DE_PopcornFXGem_v2.18.6_Win64_Linux64_LinuxARM64_Mac64.zip",
+    "version": "2.18.6",
+    "last_updated": "2024-03-28",
     "type": "Code",
     "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.",
     "canonical_tags": [
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,5 @@

		#define PK_O3DE_NEW_LIT 1
		#define PK_O3DE_NEW_PBR 1
		#define PK_O3DE_LIT_MULTI_VIEW 0