AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 19:44:55 +00:00
Code Issues Projects Releases Wiki Activity

GuiSys Image geometry fixes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/GuiSys/CTextParser.cpp
View File

@@ -250,11 +250,11 @@ CFontImageDef CTextParser::GetImage(const char16_t* str, int len)
AdvanceTokenPos();
AdvanceCommaPos();
float scaleX = u16stof(&iterable[tokenPos]);
float cropX = u16stof(&iterable[tokenPos]);
AdvanceTokenPos();
AdvanceCommaPos();
float scaleY = u16stof(&iterable[tokenPos]);
float cropY = u16stof(&iterable[tokenPos]);
AdvanceTokenPos();
std::vector<TToken<CTexture>> texs;
@@ -267,17 +267,17 @@ CFontImageDef CTextParser::GetImage(const char16_t* str, int len)
AdvanceTokenPos();
} while (commaPos != iterable.size());
return CFontImageDef(texs, interval, zeus::CVector2f(scaleX, scaleY));
return CFontImageDef(texs, interval, zeus::CVector2f(cropX, cropY));
}
else if (BeginsWith(str, len, u"SI"))
{
/* Scaled single texture */
AdvanceCommaPos();
float scaleX = u16stof(&iterable[tokenPos]);
float cropX = u16stof(&iterable[tokenPos]);
AdvanceTokenPos();
AdvanceCommaPos();
float scaleY = u16stof(&iterable[tokenPos]);
float cropY = u16stof(&iterable[tokenPos]);
AdvanceTokenPos();
AdvanceCommaPos();
@@ -285,7 +285,7 @@ CFontImageDef CTextParser::GetImage(const char16_t* str, int len)
GetAssetIdFromString(&iterable[tokenPos])});
AdvanceTokenPos();
return CFontImageDef(tex, zeus::CVector2f(scaleX, scaleY));
return CFontImageDef(tex, zeus::CVector2f(cropX, cropY));
}
}