birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ILyShine an AZ::Interface (#6923)

Browse Source 
* Move ILyShine instance out of legacy code

Signed-off-by: abrmich <abrmich@amazon.com>

* Remove last remaining reference of gEnv->pLyShine

Signed-off-by: abrmich <abrmich@amazon.com>

* Make m_lyShine a unique pointer

Signed-off-by: abrmich <abrmich@amazon.com>
This commit is contained in:
michabr
2022-01-21 15:03:57 -08:00
committed by GitHub
parent cdf748a5ed
commit 7fa6a82f55
25 changed files with 97 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/LyShineSystemComponent.cpp
+11 -9
View File
@@ -384,16 +384,16 @@ namespace LyShine
// When module is linked statically, we'll share the application's gEnv pointer.
gEnv = system.GetGlobalEnvironment();
#endif
m_pLyShine = new CLyShine(gEnv->pSystem);
gEnv->pLyShine = m_pLyShine;
m_lyShine = AZStd::make_unique<CLyShine>();
AZ::Interface<ILyShine>::Register(m_lyShine.get());
system.GetILevelSystem()->AddListener(this);
BroadcastCursorImagePathname();
if (gEnv->pLyShine)
if (AZ::Interface<ILyShine>::Get())
{
gEnv->pLyShine->PostInit();
AZ::Interface<ILyShine>::Get()->PostInit();
}
}
@@ -402,18 +402,20 @@ namespace LyShine
{
system.GetILevelSystem()->RemoveListener(this);
gEnv->pLyShine = nullptr;
delete m_pLyShine;
m_pLyShine = nullptr;
if (m_lyShine)
{
AZ::Interface<ILyShine>::Unregister(m_lyShine.get());
m_lyShine.reset();
}
}
////////////////////////////////////////////////////////////////////////
void LyShineSystemComponent::OnUnloadComplete([[maybe_unused]] const char* levelName)
{
// Perform level unload procedures for the LyShine UI system
if (gEnv && gEnv->pLyShine)
if (AZ::Interface<ILyShine>::Get())
{
gEnv->pLyShine->OnLevelUnload();
AZ::Interface<ILyShine>::Get()->OnLevelUnload();
}
}