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/Script/UiCanvasLuaBus.cpp
+2 -2
View File
@@ -114,7 +114,7 @@ AZ::EntityId UiCanvasLuaProxy::LoadCanvas(const char* canvasFilename)
CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING,
"UiCanvasLuaProxy:LoadCanvas is deprecated. Please use UiCanvasManagerBus:LoadCanvas instead\n");
return gEnv->pLyShine->LoadCanvas(canvasFilename);
return AZ::Interface<ILyShine>::Get()->LoadCanvas(canvasFilename);
}
void UiCanvasLuaProxy::UnloadCanvas(AZ::EntityId canvasEntityId)
@@ -130,7 +130,7 @@ void UiCanvasLuaProxy::UnloadCanvas(AZ::EntityId canvasEntityId)
UiCanvasComponent* canvasComponent = canvasEntity->FindComponent<UiCanvasComponent>();
if (canvasComponent)
{
gEnv->pLyShine->ReleaseCanvas(canvasEntityId, false);
AZ::Interface<ILyShine>::Get()->ReleaseCanvas(canvasEntityId, false);
}
else
{