Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
-1
View File
@@ -713,7 +713,6 @@ uint32 CFFont::WriteTextQuadsToBuffers(SVF_P2F_C4B_T2F_F4B* verts, uint16* indic
{
};
IRenderer* pRenderer = gEnv->pRenderer;
CreateQuadsForText(x, y, z, pStr, asciiMultiLine, ctx, AddQuad, BeginPass);
+1 -1
View File
@@ -308,7 +308,7 @@ Vec2 CFontRenderer::GetKerning(uint32_t leftGlyph, uint32_t rightGlyph)
const FT_UInt leftGlyphIndex = FT_Get_Char_Index(m_pFace, leftGlyph);
const FT_UInt rightGlyphIndex = FT_Get_Char_Index(m_pFace, rightGlyph);
FT_Error ftError = FT_Get_Kerning(m_pFace, leftGlyphIndex, rightGlyphIndex, FT_KERNING_DEFAULT, &kerningOffsets);
[[maybe_unused]] FT_Error ftError = FT_Get_Kerning(m_pFace, leftGlyphIndex, rightGlyphIndex, FT_KERNING_DEFAULT, &kerningOffsets);
#if !defined(_RELEASE)
if (0 != ftError)
+2 -1
View File
@@ -267,8 +267,9 @@ int CFontTexture::PreCacheString(const char* szString, int* pUpdated, float size
int iUpdated = 0;
uint32 cChar;
for (Unicode::CIterator<const char*, false> it(szString); cChar = *it; ++it)
for (Unicode::CIterator<const char*, false> it(szString); *it; ++it)
{
cChar = *it;
CTextureSlot* pSlot = GetCharSlot(cChar, clampedGlyphSize);
if (!pSlot)
+1
View File
@@ -30,6 +30,7 @@ CGlyphBitmap::CGlyphBitmap()
//-------------------------------------------------------------------------------------------------
CGlyphBitmap::~CGlyphBitmap()
{
Release();
}
//-------------------------------------------------------------------------------------------------