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

Minor CRasterFont tweaks

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

5
Runtime/GuiSys/CRasterFont.cpp
View File

@ -68,7 +68,7 @@ CRasterFont::CRasterFont(urde::CInputStream& in, urde::IObjectStore& store)
{
char16_t first = in.readUint16Big();
char16_t second = in.readUint16Big();
s32 howMuch = in.readUint32Big();
s32 howMuch = in.readInt32Big();
x1c_kerning.emplace_back(first, second, howMuch);
}
@ -77,8 +77,7 @@ CRasterFont::CRasterFont(urde::CInputStream& in, urde::IObjectStore& store)
}
void CRasterFont::SinglePassDrawString(const CDrawStringOptions& opts, int x, int y, int& xout, int& yout,
CTextRenderBuffer* renderBuf,
const char16_t* str, s32 length) const
CTextRenderBuffer* renderBuf, const char16_t* str, s32 length) const
{
if (!x0_initialized)
return;

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,

2
hecl

@ -1 +1 @@
Subproject commit 373ec1909d30ef1ba14179a0e8681ca3bce9c725
Subproject commit 98d5b4f35c8784ce00ab50dace48620dd65e0261