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

Remove legacy renderer dependencies in LyShine and move LyShine headers to gem (#6049)

Browse Source 
* Remove CryRenderer dependencies

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

* Fix non-unity compile error

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

* Remove ITexture.h reference

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

* Simple file moves from CryCommon to LyShine Gem

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

* More simple file moves from CryCommon to LyShine Gem

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

* Move more headers from CryCommon to LyShine Gem

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

* Add LyShine gem module as a build dependency to fix compile error in some gems

Signed-off-by: abrmich <abrmich@amazon.com>
This commit is contained in:
michabr
2021-12-02 14:47:32 -08:00
committed by GitHub
parent 28f38ca009
commit 4d5aad13d1
131 changed files with 329 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShineExamples/Code/Source/UiCustomImageComponent.cpp
+1 -3
View File
@@ -14,8 +14,6 @@
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/RTTI/BehaviorContext.h>
#include <IRenderer.h>
#include <LyShine/Draw2d.h>
#include <LyShine/ISprite.h>
#include <LyShine/Bus/UiElementBus.h>
@@ -371,7 +369,7 @@ namespace LyShineExamples
delete [] m_cachedPrimitive.m_vertices;
}
m_cachedPrimitive.m_vertices = new SVF_P2F_C4B_T2F_F4B[numVertices];
m_cachedPrimitive.m_vertices = new LyShine::UiPrimitiveVertex[numVertices];
m_cachedPrimitive.m_numVertices = numVertices;
}
Gems/LyShineExamples/Code/Source/UiCustomImageComponent.h
+2 -1
View File
@@ -11,6 +11,7 @@
#include <LyShine/Bus/UiRenderBus.h>
#include <LyShine/Bus/UiTransformBus.h>
#include <LyShine/UiComponentTypes.h>
#include <LyShine/UiRenderFormats.h>
#include <LyShine/IRenderGraph.h>
#include <LyShineExamples/UiCustomImageBus.h>
@@ -136,7 +137,7 @@ namespace LyShineExamples
float m_overrideAlpha;
// cached rendering data for performance optimization
DynUiPrimitive m_cachedPrimitive;
LyShine::UiPrimitive m_cachedPrimitive;
bool m_isRenderCacheDirty = true;
};
}