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

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
This commit is contained in:
Esteban Papp
2021-08-05 20:05:25 -07:00
parent 4358b6eb27 6b2452379f
commit e28d04aea6
389 changed files with 5267 additions and 3581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
+9 -9
View File
@@ -332,7 +332,7 @@ void AZ::FFont::DrawStringUInternal(
m_vertexBuffer[vertexOffset + 3].color.dcolor = packedColor;
m_vertexBuffer[vertexOffset + 3].st = tc3;
uint16_t startingIndex = vertexOffset - startingVertexCount;
uint16_t startingIndex = static_cast<uint16_t>(vertexOffset - startingVertexCount);
m_indexBuffer[indexOffset + 0] = startingIndex + 0;
m_indexBuffer[indexOffset + 1] = startingIndex + 1;
m_indexBuffer[indexOffset + 2] = startingIndex + 2;
@@ -704,12 +704,12 @@ uint32_t AZ::FFont::WriteTextQuadsToBuffers(SVF_P2F_C4B_T2F_F4B* verts, uint16_t
vertexData[vertexOffset + 3].texIndex2 = 0;
vertexData[vertexOffset + 3].pad = 0;
indexData[indexOffset + 0] = vertexOffset + 0;
indexData[indexOffset + 1] = vertexOffset + 1;
indexData[indexOffset + 2] = vertexOffset + 2;
indexData[indexOffset + 3] = vertexOffset + 2;
indexData[indexOffset + 4] = vertexOffset + 3;
indexData[indexOffset + 5] = vertexOffset + 0;
indexData[indexOffset + 0] = static_cast<uint16_t>(vertexOffset + 0);
indexData[indexOffset + 1] = static_cast<uint16_t>(vertexOffset + 1);
indexData[indexOffset + 2] = static_cast<uint16_t>(vertexOffset + 2);
indexData[indexOffset + 3] = static_cast<uint16_t>(vertexOffset + 2);
indexData[indexOffset + 4] = static_cast<uint16_t>(vertexOffset + 3);
indexData[indexOffset + 5] = static_cast<uint16_t>(vertexOffset + 0);
vertexOffset += 4;
indexOffset += 6;
@@ -1343,7 +1343,7 @@ unsigned int AZ::FFont::GetEffectId(const char* effectName) const
{
if (!strcmp(m_effects[i].m_name.c_str(), effectName))
{
return i;
return static_cast<unsigned int>(i);
}
}
}
@@ -1353,7 +1353,7 @@ unsigned int AZ::FFont::GetEffectId(const char* effectName) const
unsigned int AZ::FFont::GetNumEffects() const
{
return m_effects.size();
return static_cast<unsigned int>(m_effects.size());
}
const char* AZ::FFont::GetEffectName(unsigned int effectId) const