PopcornFX Gem 2.15.8

PopcornFX · May 12, 2023 · 325712f · 325712f
1 parent 95f89a7
commit 325712f
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,13 +4,14 @@
 #----------------------------------------------------------------------------
 
 #List of supported O3DE versions, uncomment one of the line to force the version
+#set(PK_O3DE_ENGINE_VERSION "2305.0")
 #set(PK_O3DE_ENGINE_VERSION "2210.0")
 #set(PK_O3DE_ENGINE_VERSION "2205.0")
 #set(PK_O3DE_ENGINE_VERSION "2111.2")
 #set(PK_O3DE_ENGINE_VERSION "2111.1")
 
 #Latest supported O3DE version
-set(PK_O3DE_ENGINE_VERSION_LATEST "2210.0")
+set(PK_O3DE_ENGINE_VERSION_LATEST "2305.0")
 
 if (${PK_O3DE_ENGINE_VERSION})
     set(o3de_build_number ${PK_O3DE_ENGINE_VERSION})

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.7)
+set(POPCORNFX_VERSION 2.15.8)
 set(POPCORNFX_LICENSE O3DE)
 
 if (PK_O3DE_MAJOR_VERSION GREATER_EQUAL 2205)
@@ -95,6 +95,7 @@ ly_add_target(
 )
 
 ly_create_alias(NAME PopcornFX.Clients NAMESPACE Gem TARGETS Gem::PopcornFX)
+ly_create_alias(NAME PopcornFX.Unified NAMESPACE Gem TARGETS Gem::PopcornFX)
 #ly_create_alias(NAME PopcornFX.Servers NAMESPACE Gem TARGETS Gem::PopcornFX)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)

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 5e2462f0e3ce5dc216fc7529229178ecaddd9687dfd1f207b8bf984679fc8408)
-set(pk_package_id 57Z7u37N7scm9brv)
+set(pk_package_hash 392195010920c3118f511d96e91e8dac51c77b9c91204fe4b69a3c90f5768dd8)
+set(pk_package_id CQxSNvZcNxGkUhVN)
 
 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 ff42ea79e39e0043c1f95cc482bedb4d2f31a28357993d26bf5d96177c31781e)
-set(pk_package_id zgngBYNEPRbER5j8)
+set(pk_package_hash e9d7db7a05f760ff050758e4937a979fe8b5538f6c566868dd85ba71c45287ee)
+set(pk_package_id TeGfLK4LVL3rCgyR)
 
 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 4dc1131ead84b8218ea73b68c7b99469304e225122bd0e1c0e1d0f18d5bc5b0b)
-set(pk_package_id MVSHfKVM4juDnDt5)
+set(pk_package_hash 15a5398107b86492949520980238a54f3f4c48223bcc5f522906220750c91ea4)
+set(pk_package_id 7hWNPvRDQuvcap98)
 
 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/Managers/SceneViewsManager.cpp b/Code/Source/Integration/Managers/SceneViewsManager.cpp
@@ -24,7 +24,7 @@ void	CSceneViewsManager::Activate()
 
 void	CSceneViewsManager::Deactivate()
 {
-	m_SceneViews.m_Views.Clear();
+	m_SceneViews.m_Views.Clean();
 }
 
 void	CSceneViewsManager::Update(CParticleMediumCollection *mediumCollection)

diff --git a/Code/Source/Integration/Managers/StatsManager.cpp b/Code/Source/Integration/Managers/StatsManager.cpp
@@ -145,6 +145,9 @@ void	CStatsManager::Deactivate()
 	PopcornFXProfilerRequestBus::Handler::BusDisconnect();
 	AZ::RPI::ViewportContextNotificationBus::Handler::BusDisconnect();
 	m_whiteTex = null;
+	m_MemoryFrames.Clean();
+	m_EffectTimings.Clean();
+	m_EffectTimings_Sum.Clean();
 }
 
 void	CStatsManager::Reset(CParticleMediumCollection *mediumCollection)

diff --git a/Code/Source/Integration/Managers/WindManager.cpp b/Code/Source/Integration/Managers/WindManager.cpp
@@ -221,6 +221,7 @@ void	CWindManager::Activate()
 void	CWindManager::Deactivate()
 {
 	Physics::WindNotificationsBus::Handler::BusDisconnect();
+	m_SceneWindSimInterfacePath = CString::EmptyString;
 }
 
 void	CWindManager::Update()

diff --git a/Code/Source/Integration/Managers/WindManager.h b/Code/Source/Integration/Managers/WindManager.h
@@ -42,7 +42,7 @@ class CWindManagerBase
 
 	static CWindManagerBase	*Get() { return s_Self; }
 
-private:
+protected:
 	bool							_BindSceneSimInterface() const;
 	void							_UnbindSceneSimInterface();
 

diff --git a/Code/Source/Integration/Render/AtomIntegration/PopcornFXFeatureProcessor.cpp b/Code/Source/Integration/Render/AtomIntegration/PopcornFXFeatureProcessor.cpp
@@ -61,9 +61,6 @@ void	CPopcornFXFeatureProcessor::Deactivate()
 void	CPopcornFXFeatureProcessor::Simulate(const SimulatePacket &packet)
 {
 	AZ_UNUSED(packet);
-	if (!CCurrentThread::IsRegistered())
-		CCurrentThread::RegisterUserThread();
-
 	// To enable once O3DE moves the simple point light processor GPU buffer update into their Render() function instead of Simulate()
 #if 0
 	AppendLightParticles();
@@ -446,4 +443,4 @@ void	CPopcornFXFeatureProcessor::Init(CParticleMediumCollection *medCol, const S
 #endif //O3DE_USE_PK
 
 //----------------------------------------------------------------------------
-}
+}
diff --git 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.15.7`
-* **O3DE:** `21.11`, `21.11.2`, `22.05.0`, `22.10.0`
+* **Version:** `v2.15.8`
+* **O3DE:** `21.11`, `21.11.2`, `22.05.0`, `22.10.0`, `23.03.0`
 * **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
@@ -1,13 +1,13 @@
 {
     "gem_name": "PopcornFX",
-    "display_name": "PopcornFX 2.15.7",
+    "display_name": "PopcornFX 2.15.8",
     "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.7_Win64_Linux64_Mac64.zip",
-    "version": "2.15.7",
-    "last_updated": "2023-04-27",
+    "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.15/O3DE_PopcornFXGem_v2.15.8_Win64_Linux64_Mac64.zip",
+    "version": "2.15.8",
+    "last_updated": "2023-05-11",
     "type": "Code",
     "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.",
     "canonical_tags": [