PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finish CRasterFont constructor, has regswaps though 

Former-commit-id: febfc28b63
This commit is contained in:
Phillip Stephens 2022-12-23 21:07:46 -08:00
parent 26e8562b06
commit e3cd879f16
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/Kyoto/Text/CRasterFont.hpp
View File

@ -10,9 +10,8 @@
#include "string.h" #include "string.h"
class CGlyph;
class CKernPair;
class CTexture; class CTexture;
class CDrawStringOptions;
class IObjectStore; class IObjectStore;
class CFontInfo { class CFontInfo {
@ -104,6 +103,8 @@ public:
CRasterFont(CInputStream& in, IObjectStore* store); CRasterFont(CInputStream& in, IObjectStore* store);
~CRasterFont(); ~CRasterFont();
EFontMode GetMode() const;
void GetSize(const CDrawStringOptions&, int&, int&, const wchar_t*, int) const;
void SetTexture(TToken< CTexture > token) { x80_texture = token; } void SetTexture(TToken< CTexture > token) { x80_texture = token; }
bool IsFinishedLoading(); bool IsFinishedLoading();

23
src/Kyoto/Text/CRasterFont.cpp
View File

@ -16,7 +16,12 @@ CRasterFont::CRasterFont(CInputStream& in, IObjectStore* store)
if (version >= 0 && version <= 2) { if (version >= 0 && version <= 2) {
x4_monoWidth = in.ReadInt32(); x4_monoWidth = in.ReadInt32();
x8_monoHeight = in.ReadInt32(); x8_monoHeight = in.ReadInt32();
x8c_baseline = version >= 1 ? in.ReadInt32() : x8_monoHeight; if (version >= 1) {
x8c_baseline = in.ReadInt32();
} else {
x8c_baseline = x8_monoHeight;
}
if (version >= 2) { if (version >= 2) {
x90_lineMargin = in.ReadInt32(); x90_lineMargin = in.ReadInt32();
} }
@ -68,6 +73,22 @@ CRasterFont::CRasterFont(CInputStream& in, IObjectStore* store)
rstl::sort( rstl::sort(
xc_glyphs.begin(), xc_glyphs.end(), xc_glyphs.begin(), xc_glyphs.end(),
rstl::default_pair_sorter_finder< rstl::vector< rstl::pair< wchar_t, CGlyph > > >()); rstl::default_pair_sorter_finder< rstl::vector< rstl::pair< wchar_t, CGlyph > > >());
int kerningCount = in.ReadInt32();
x1c_kerning.reserve(kerningCount);
for (int i = 0; i < kerningCount; ++i) {
short first = in.ReadShort();
short second = in.ReadShort();
int howMuch = in.ReadInt32();
x1c_kerning.push_back(CKernPair(first, second, howMuch));
}
x0_initialized = true;
} }
} }
} }
EFontMode CRasterFont::GetMode() const { return x2c_mode; }
void CRasterFont::GetSize(const CDrawStringOptions&, int&, int&, const wchar_t*, int) const {}