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

Integrating github/staging through commit ab87ed9

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
-3
View File
@@ -296,8 +296,6 @@ void AZ::FFont::DrawStringUInternal(float x, float y, float z, const char* str,
const bool orthoMode = ctx.m_overrideViewProjMatrices;
int baseState = ctx.m_baseState;
const RHI::Viewport& viewport = m_windowContext->GetViewport();
const float viewX = viewport.m_minX;
const float viewY = viewport.m_minY;
@@ -322,7 +320,6 @@ void AZ::FFont::DrawStringUInternal(float x, float y, float z, const char* str,
}
size_t startingVertexCount = m_vertexCount;
size_t startingIndexCount = m_indexCount;
// Local function that is passed into CreateQuadsForText as the AddQuad function
AddFunction AddQuad = [this, startingVertexCount]
Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp
+1 -1
View File
@@ -309,7 +309,7 @@ Vec2 AZ::FontRenderer::GetKerning(uint32_t leftGlyph, uint32_t rightGlyph)
const FT_UInt leftGlyphIndex = FT_Get_Char_Index(m_face, leftGlyph);
const FT_UInt rightGlyphIndex = FT_Get_Char_Index(m_face, rightGlyph);
FT_Error ftError = FT_Get_Kerning(m_face, leftGlyphIndex, rightGlyphIndex, FT_KERNING_DEFAULT, &kerningOffsets);
[[maybe_unused]] FT_Error ftError = FT_Get_Kerning(m_face, leftGlyphIndex, rightGlyphIndex, FT_KERNING_DEFAULT, &kerningOffsets);
#if !defined(_RELEASE)
if (0 != ftError)
Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp
+2 -1
View File
@@ -261,8 +261,9 @@ int AZ::FontTexture::PreCacheString(const char* string, int* updated, float size
int updateCount = 0;
uint32_t character;
for (Unicode::CIterator<const char*, false> it(string); character = *it; ++it)
for (Unicode::CIterator<const char*, false> it(string); *it; ++it)
{
character = *it;
TextureSlot* slot = GetCharSlot(character, clampedGlyphSize);
if (!slot)