PopcornFX Gem 2.14.5

PopcornFX · Jan 6, 2023 · 3f926e0 · 3f926e0
1 parent 45ce8d2
commit 3f926e0
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 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.14.4)
+set(POPCORNFX_VERSION 2.14.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 ea56315d5fb18d263bc44dda596ee7fc1993b00030ea0572616aef387e9a6450)
-set(pk_package_id rQQTkdjkseGfGJWk)
+set(pk_package_hash 6c8c3724c6e13799b612884d20204b5a23abedeeec1b2b1431d99c6b6501f240)
+set(pk_package_id 3FN6huvvQmdwFXvT)
 
 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 d56cef1e1483509d17d0de8f6dedc50d27f48fde5d1344f81352a4cfc114d7d8)
-set(pk_package_id RzQHCGEkk3npR6ez)
+set(pk_package_hash 9ac664bb7bc712496fd38b7e9355160eb4d33730925ea29bfe3ef7d2f5723e54)
+set(pk_package_id tHDExhrfFppdUw5s)
 
 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 706f81c6305dfc0bb5f01fe876d0557cf16c76c80e3935310d686e4efa070110)
-set(pk_package_id nfgXsP2QCy7YjMdZ)
+set(pk_package_hash 54a6dbf6fbcd11937a6490641e560a7cf039467ce4462a00462d0ff29b0ef6bb)
+set(pk_package_id bfdJnYqT84qBKXBS)
 
 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/ResourceHandlers/MeshResourceHandler.cpp b/Code/Source/Integration/ResourceHandlers/MeshResourceHandler.cpp
@@ -101,14 +101,14 @@ void	*CMeshResourceHandler::Load(	const CResourceManager	*resourceManager,
 	const AZStd::span<const CFloat3>	srcPositions = mesh.GetSemanticBufferTyped<CFloat3>(AZ::Name("POSITION"));
 	const AZStd::span<const CFloat3>	srcNormals = mesh.GetSemanticBufferTyped<CFloat3>(AZ::Name("NORMAL"));
 	const AZStd::span<const CFloat2>	srcUvs = mesh.GetSemanticBufferTyped<CFloat2>(AZ::Name("UV"));
-	const AZStd::span<const CFloat3>	srcTangents = mesh.GetSemanticBufferTyped<CFloat3>(AZ::Name("TANGENT"));
+	const AZStd::span<const CFloat4>	srcTangents = mesh.GetSemanticBufferTyped<CFloat4>(AZ::Name("TANGENT"));
 	const AZStd::span<const CFloat4>	srcColors = mesh.GetSemanticBufferTyped<CFloat4>(AZ::Name("COLOR"));
 #else
 	const AZStd::array_view<u32>		srcIndices = mesh.GetIndexBufferTyped<u32>();
 	const AZStd::array_view<CFloat3>	srcPositions = mesh.GetSemanticBufferTyped<CFloat3>(AZ::Name("POSITION"));
 	const AZStd::array_view<CFloat3>	srcNormals = mesh.GetSemanticBufferTyped<CFloat3>(AZ::Name("NORMAL"));
 	const AZStd::array_view<CFloat2>	srcUvs = mesh.GetSemanticBufferTyped<CFloat2>(AZ::Name("UV"));
-	const AZStd::array_view<CFloat3>	srcTangents = mesh.GetSemanticBufferTyped<CFloat3>(AZ::Name("TANGENT"));
+	const AZStd::array_view<CFloat4>	srcTangents = mesh.GetSemanticBufferTyped<CFloat4>(AZ::Name("TANGENT"));
 	const AZStd::array_view<CFloat4>	srcColors = mesh.GetSemanticBufferTyped<CFloat4>(AZ::Name("COLOR"));
 #endif
 
@@ -194,7 +194,7 @@ void	*CMeshResourceHandler::Load(	const CResourceManager	*resourceManager,
 			dstUvs[index] = srcUvs[index];
 
 		if (!dstTangents.Empty())
-			dstTangents[index] = CFloat4(srcTangents[index], 1.f);
+			dstTangents[index] = srcTangents[index];
 
 		if (!dstColors.Empty())
 			dstColors[index] = srcColors[index];

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.14.4`
+* **Version:** `v2.14.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
@@ -4,8 +4,8 @@
     "license": "Community",
     "license_url": "https://www.popcornfx.com/popcornfx-community-license",
     "origin": "Persistant Studios - popcornfx.com",
-    "version": "2.14.4",
-    "last_updated": "2022-12-15",
+    "version": "2.14.5",
+    "last_updated": "2023-01-05",
     "type": "Code",
     "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.",
     "canonical_tags": [