2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 11:07:44 +00:00

GuiSys Image geometry fixes

This commit is contained in:
Jack Andersen
2017-01-29 20:58:59 -10:00
parent e276bd3be9
commit 83baca806d
9 changed files with 38 additions and 36 deletions

View File

@@ -34,20 +34,29 @@ void CTextSupportShader::CharacterInstance::SetMetrics(const CGlyph& glyph,
m_uv[3].assign(glyph.GetEndU(), 1.f - glyph.GetEndV(), layer);
}
void CTextSupportShader::ImageInstance::SetMetrics(const zeus::CVector2f& imgSize,
void CTextSupportShader::ImageInstance::SetMetrics(const CFontImageDef& imgDef,
const zeus::CVector2i& offset)
{
zeus::CVector2f imgSize;
if (imgDef.x4_texs.size())
{
const CTexture& tex = *imgDef.x4_texs[0].GetObj();
imgSize.assign(tex.GetWidth() * imgDef.x14_cropFactor.x,
tex.GetHeight() * imgDef.x14_cropFactor.y);
}
zeus::CVector2f cropPad = imgDef.x14_cropFactor * 0.5f;
m_pos[0].assign(offset.x, 0.f, offset.y);
m_uv[0].assign(0.f, 1.f);
m_uv[0].assign(0.5f - cropPad.x, 0.5f + cropPad.y);
m_pos[1].assign(offset.x + imgSize.x, 0.f, offset.y);
m_uv[1].assign(1.f, 1.f);
m_uv[1].assign(0.5f + cropPad.x, 0.5f + cropPad.y);
m_pos[2].assign(offset.x, 0.f, offset.y + imgSize.y);
m_uv[2].assign(0.f, 0.f);
m_uv[2].assign(0.5f - cropPad.x, 0.5f - cropPad.y);
m_pos[3].assign(offset.x + imgSize.x, 0.f, offset.y + imgSize.y);
m_uv[3].assign(1.f, 0.f);
m_uv[3].assign(0.5f + cropPad.x, 0.5f - cropPad.y);
}
void CTextSupportShader::Shutdown()