Merge branch 'v2.15-LTS'

# Conflicts: # Code/CMakeLists.txt # Code/Platform/Linux/PAL_linux.cmake # Code/Platform/Mac/PAL_mac.cmake # Code/Platform/Windows/PAL_windows.cmake # README.md # gem.json
PopcornFX · May 12, 2023 · 636a3ca · 636a3ca
2 parents c748354 + 325712f
commit 636a3ca
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 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
@@ -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/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
@@ -2,7 +2,7 @@
 
 Integrates the **PopcornFX Runtime SDK** into **O3DE** as a Gem.
 * **Version:** `v2.16.2`
-* **O3DE:** `21.11`, `21.11.2`, `22.05.0`, `22.10.0`
+* **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.