PopcornFX Gem 2.15.5

PopcornFX · Mar 31, 2023 · ba2374e · ba2374e
1 parent c4d0024
commit ba2374e
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 22 deletions.
diff --git a/Assets/shaders/Ribbon/Legacy/RibbonLit_Legacy.azsl b/Assets/shaders/Ribbon/Legacy/RibbonLit_Legacy.azsl
@@ -23,7 +23,7 @@ struct VertexInput
 
 struct VertexInputAtlasBlend
 {
-    float3 m_position : POSITION;
+    float4 m_position : POSITION;
     float2 m_texCoord0 : UV0;
     float2 m_texCoord1 : UV1;
     float m_texFrameLerp : UV2;
@@ -35,7 +35,7 @@ struct VertexInputAtlasBlend
 
 struct VertexInputCorrectDeformation
 {
-    float3 m_position : POSITION;
+    float4 m_position : POSITION;
     float2 m_texCoord0 : UV0;
     float4 m_UVRemap : UV1;
     float2 m_UVFactors : UV2;

diff --git a/Assets/shaders/Ribbon/Legacy/Ribbon_Legacy.azsl b/Assets/shaders/Ribbon/Legacy/Ribbon_Legacy.azsl
@@ -28,7 +28,7 @@ struct VertexInput
 
 struct VertexInputAtlasBlend
 {
-    float3 m_position : POSITION;
+    float4 m_position : POSITION;
     float2 m_texCoord0 : UV0;
     float2 m_texCoord1 : UV1;
     float m_texFrameLerp : UV2;
@@ -38,7 +38,7 @@ struct VertexInputAtlasBlend
 
 struct VertexInputCorrectDeformation
 {
-    float3 m_position : POSITION;
+    float4 m_position : POSITION;
     float2 m_texCoord0 : UV0;
     float4 m_UVRemap : UV1;
     float2 m_UVFactors : UV2;

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.4)
+set(POPCORNFX_VERSION 2.15.5)
 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
@@ -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 d3977d4c24474376ca3058b57524502349a22468eb4f96e422c577ac4e9443b8)
-set(pk_package_id SyfMKMHrQk9KKwZS)
+set(pk_package_hash fe6a023213f83cc1d638ecb3f93011d4373dcec210a9c3108bc4cf3899277157)
+set(pk_package_id GEzK68Mn6zW5bfYc)
 
 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 504df01b29bf59cfe3c1ec22b29641e728c411ff60bae79a0468e3136174964b)
-set(pk_package_id 5cheqdwMvyaaSn98)
+set(pk_package_hash 0d9fdde0e48fb0eb3dfba42effdfacfa60fc6ab1409e1c6d58402427a3468f11)
+set(pk_package_id CPvV8CYLaf3vQ6rK)
 
 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 2c33dc945512cb1a3f8bce22e140d6747ba90e0ee0d7a2674ae13af01797b407)
-set(pk_package_id hBPWpXze4nNvB36C)
+set(pk_package_hash b025157ba6389c6b5c3de7c89c0db406f73981caa5c6927afb072ee2b93f7215)
+set(pk_package_id ypyeht6XQndRnPJ7)
 
 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/Preloader/PopcornFXRendererLoader.cpp b/Code/Source/Integration/Preloader/PopcornFXRendererLoader.cpp
@@ -580,16 +580,16 @@ AZ::RHI::ConstPtr<AZ::RHI::PipelineState>	PopcornFXRendererLoader::_CreatePipeli
 			usedShader == EPopcornFXShader::RibbonLitLegacy_Shader ||
 			usedShader == EPopcornFXShader::RibbonDistortion_Shader)
 		{
-			layoutBuilder.AddBuffer()->Channel("POSITION", AZ::RHI::Format::R32G32B32_FLOAT);
+			layoutBuilder.AddBuffer()->Channel("POSITION", AZ::RHI::Format::R32G32B32A32_FLOAT);
 			if (assetType == AssetType_MaterialShader)
 			{
 				layoutBuilder.AddBuffer()->Channel("UV0", AZ::RHI::Format::R32G32_FLOAT); // texCoord 0
 			}
 		}
 		else if (usedShader == EPopcornFXShader::RibbonAtlasBlendLegacy_Shader ||
-			usedShader == EPopcornFXShader::RibbonLitAtlasBlendLegacy_Shader)
+				 usedShader == EPopcornFXShader::RibbonLitAtlasBlendLegacy_Shader)
 		{
-			layoutBuilder.AddBuffer()->Channel("POSITION", AZ::RHI::Format::R32G32B32_FLOAT);
+			layoutBuilder.AddBuffer()->Channel("POSITION", AZ::RHI::Format::R32G32B32A32_FLOAT);
 			if (assetType == AssetType_MaterialShader)
 			{
 				layoutBuilder.AddBuffer()->Channel("UV0", AZ::RHI::Format::R32G32_FLOAT); // texCoord 0
@@ -598,9 +598,9 @@ AZ::RHI::ConstPtr<AZ::RHI::PipelineState>	PopcornFXRendererLoader::_CreatePipeli
 			}
 		}
 		else if (usedShader == EPopcornFXShader::RibbonCorrectDeformationLegacy_Shader ||
-			usedShader == EPopcornFXShader::RibbonLitCorrectDeformationLegacy_Shader)
+				 usedShader == EPopcornFXShader::RibbonLitCorrectDeformationLegacy_Shader)
 		{
-			layoutBuilder.AddBuffer()->Channel("POSITION", AZ::RHI::Format::R32G32B32_FLOAT);
+			layoutBuilder.AddBuffer()->Channel("POSITION", AZ::RHI::Format::R32G32B32A32_FLOAT);
 			if (assetType == AssetType_MaterialShader)
 			{
 				layoutBuilder.AddBuffer()->Channel("UV0", AZ::RHI::Format::R32G32_FLOAT); // texCoord 0

diff --git a/Code/Source/PopcornFXModule.cpp b/Code/Source/PopcornFXModule.cpp
@@ -17,7 +17,8 @@
 #include "Components/Helpers/PopcornFXHelperLoopEmitterEditorComponent.h"
 #include "Components/Helpers/PopcornFXHelperProfilerEditorComponent.h"
 #include "PopcornFXPreviewersSystemComponent.h"
-#elif defined(POPCORNFX_BUILDER)
+#endif
+#if defined(POPCORNFX_BUILDER)
 #include "Asset/PopcornFXAssetBuilderComponent.h"
 #endif
 

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.4`
+* **Version:** `v2.15.5`
 * **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.4",
+    "display_name": "PopcornFX 2.15.5",
     "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.4_Win64_Linux64_Mac64.zip",
-    "version": "2.15.4",
-    "last_updated": "2023-03-09",
+    "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.15/O3DE_PopcornFXGem_v2.15.5_Win64_Linux64_Mac64.zip",
+    "version": "2.15.5",
+    "last_updated": "2023-03-30",
     "type": "Code",
     "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.",
     "canonical_tags": [