AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-12 22:46:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix font rendering and world teleporter in MPT and PAL

Browse Source
This commit is contained in:
Phillip Stephens
2019-12-11 10:55:19 -08:00
parent b507799478
commit 70747e23d5
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Runtime/GuiSys/CRasterFont.hpp
View File

@@ -103,7 +103,7 @@ class CRasterFont {
s32 x8_monoHeight = 16;
std::vector<std::pair<char16_t, CGlyph>> xc_glyphs;
std::vector<CKernPair> x1c_kerning;
EColorType x2c_mode = EColorType::Main;
CTexture::EFontType x2c_mode = CTexture::EFontType::OneLayer;
CFontInfo x30_fontInfo;
TLockedToken<CTexture> x80_texture;
s32 x8c_baseline;
@@ -125,7 +125,20 @@ public:
s32 GetMonoWidth() const { return x4_monoWidth; }
s32 GetMonoHeight() const { return x8_monoHeight; }
EColorType GetMode() const { return x2c_mode; }
EColorType GetMode() const {
switch(x2c_mode) {
case CTexture::EFontType::OneLayer:
case CTexture::EFontType::TwoLayers:
case CTexture::EFontType::FourLayers:
return EColorType::Main;
case CTexture::EFontType::OneLayerOutline:
case CTexture::EFontType::TwoLayersOutlines:
case CTexture::EFontType::TwoLayersOutlines2:
return EColorType::Outline;
default:
return EColorType::Main;
}
}
s32 GetLineMargin() const { return x90_lineMargin; }
s32 GetCarriageAdvance() const { return GetLineMargin() + GetMonoHeight(); }
@@ -148,7 +161,7 @@ public:
const CGlyph* GetGlyph(char16_t chr) const { return InternalGetGlyph(chr); }
void GetSize(const CDrawStringOptions& opts, int& width, int& height, const char16_t* str, int len) const;
const boo::ObjToken<boo::ITexture>& GetTexture() {
return x80_texture->GetFontTexture(CTexture::EFontType(x2c_mode));
return x80_texture->GetFontTexture(x2c_mode);
}
bool IsFinishedLoading() const;