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

Remove (almost) all references to pRenderer (#651)

Browse Source 
Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
This commit is contained in:
bosnichd
2021-05-10 10:05:15 -06:00
committed by GitHub
parent 4a2e6a77b5
commit 440c40e490
191 changed files with 118 additions and 23548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
-1
View File
@@ -79,7 +79,6 @@ namespace AZ
FontFamilyPtr LoadFontFamily(const char* fontFamilyName) override;
FontFamilyPtr GetFontFamily(const char* fontFamilyName) override;
void AddCharsToFontTextures(FontFamilyPtr fontFamily, const char* chars, int glyphSizeX = ICryFont::defaultGlyphSizeX, int glyphSizeY = ICryFont::defaultGlyphSizeY) override;
void SetRendererProperties([[maybe_unused]] IRenderer* renderer) override {}
void GetMemoryUsage([[maybe_unused]] ICrySizer* sizer) const override {}
string GetLoadedFontNames() const;
void OnLanguageChanged() override;
Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h
-1
View File
@@ -79,7 +79,6 @@ namespace AZ
virtual FontFamilyPtr LoadFontFamily([[maybe_unused]] const char* fontFamilyName) override { CRY_ASSERT(false); return nullptr; }
virtual FontFamilyPtr GetFontFamily([[maybe_unused]] const char* fontFamilyName) override { CRY_ASSERT(false); return nullptr; }
virtual void AddCharsToFontTextures([[maybe_unused]] FontFamilyPtr fontFamily, [[maybe_unused]] const char* chars, [[maybe_unused]] int glyphSizeX, [[maybe_unused]] int glyphSizeY) override {};
virtual void SetRendererProperties([[maybe_unused]] IRenderer* pRenderer) override {}
virtual void GetMemoryUsage([[maybe_unused]] ICrySizer* sizer) const override {}
virtual string GetLoadedFontNames() const override { return ""; }
virtual void OnLanguageChanged() override { }
Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
+2 -1
View File
@@ -1233,7 +1233,8 @@ void AZ::FFont::WrapText(string& result, float maxWidth, const char* str, const
if (ctx.m_sizeIn800x600)
{
maxWidth = gEnv->pRenderer->ScaleCoordX(maxWidth);
// ToDo: Update to work with Atom? LYN-3676
// maxWidth = ???->ScaleCoordX(maxWidth);
}
Vec2 strSize = GetTextSize(result.c_str(), true, ctx);