AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Jack Andersen 2016-03-17 12:20:06 -10:00
parent 5b6333fb60 becd55a9d2
commit 7c7140cffd
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/GuiSys/CRasterFont.cpp
View File

@ -18,7 +18,7 @@ CRasterFont::CRasterFont(urde::CInputStream& in, urde::IObjectStore& store)
x8c_baseline = x8_monoHeight; x8c_baseline = x8_monoHeight;
if (version >= 2) if (version >= 2)
x90_ = in.readUint32Big(); x90_lineMargin = in.readUint32Big();
bool tmp1 = in.readBool(); bool tmp1 = in.readBool();
bool tmp2 = in.readBool(); bool tmp2 = in.readBool();

15
Runtime/GuiSys/CRasterFont.hpp
View File

@ -112,8 +112,7 @@ class CRasterFont
TToken<CTexture> x80_texture; TToken<CTexture> x80_texture;
bool x88_ = false; bool x88_ = false;
s32 x8c_baseline; s32 x8c_baseline;
s32 x90_ = 0; s32 x90_lineMargin = 0;
char* fontName;
const CGlyph* InternalGetGlyph(wchar_t chr) const const CGlyph* InternalGetGlyph(wchar_t chr) const
{ {
@ -128,11 +127,13 @@ class CRasterFont
public: public:
CRasterFont(CInputStream& in, IObjectStore& store); CRasterFont(CInputStream& in, IObjectStore& store);
s32 GetMonoWidth() { return x4_monoWidth; } s32 GetMonoWidth() const { return x4_monoWidth; }
s32 GetMonoHeight() { return x8_monoHeight; } s32 GetMonoHeight() const { return x8_monoHeight; }
s32 GetMode() { return x2c_mode; } s32 GetMode() const { return x2c_mode; }
s32 sub_802FFF5C() { return x90_; } s32 GetLineMargin() const { return x90_lineMargin; }
s32 GetBaseline() { return x8c_baseline; } s32 GetCarriageAdvance() const { return GetLineMargin() + GetMonoHeight(); }
s32 GetBaseline() const { return x8c_baseline; }
static s32 KernLookup(const std::vector<CKernPair>& kernTable, s32 kernStart, s32 chr) static s32 KernLookup(const std::vector<CKernPair>& kernTable, s32 kernStart, s32 chr)
{ {
auto iter = kernTable.cbegin() + kernStart; auto iter = kernTable.cbegin() + kernStart;

2
hecl

@ -1 +1 @@
Subproject commit 64ff101b73f5c639ab592adbcd54e9b20064eaf3 Subproject commit e9b881d42b42d0efa0cde85cfc0e029777df18a7