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

Minor CRasterFont tweaks

Browse Source
This commit is contained in:
Jack Andersen
2017-01-31 21:20:18 -10:00
parent 5b5f3318b0
commit 802cf9d811
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/GuiSys/CRasterFont.hpp
View File

@@ -64,12 +64,12 @@ private:
public:
CKernPair() = default;
CKernPair(char16_t first, char16_t second, s32 howMuch)
: x0_first(first), x2_second(second), x4_howMuch(howMuch)
: x0_first(first), x2_second(second), x4_howMuch(howMuch)
{}
char16_t GetFirst() const { return x0_first; }
char16_t GetSecond() const { return x2_second; }
s32 GetHowMuch() const { return x4_howMuch; }
s32 GetHowMuch() const { return x4_howMuch; }
};
class CFontInfo
@@ -122,7 +122,7 @@ public:
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, char16_t chr)
{
auto iter = kernTable.cbegin() + kernStart;
for (; iter != kernTable.cend() && iter->GetFirst() == kernTable[kernStart].GetFirst() ; ++iter)
@@ -136,8 +136,7 @@ public:
void SinglePassDrawString(const CDrawStringOptions&, int x, int y, int& xout, int& yout,
CTextRenderBuffer* renderBuf,
const char16_t* str, s32 len) const;
CTextRenderBuffer* renderBuf, const char16_t* str, s32 len) const;
void DrawSpace(const CDrawStringOptions& opts, int x, int y, int& xout, int& yout, int len) const;
void DrawString(const CDrawStringOptions& opts, int x, int y, int& xout, int& yout,
CTextRenderBuffer* renderBuf,