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

FRME bug fixes and shader adjustments

Browse Source
This commit is contained in:
Jack Andersen
2017-01-29 18:16:20 -10:00
parent 1fbd08b7c6
commit 83176b41a9
39 changed files with 424 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Runtime/GuiSys/CGuiTextSupport.hpp
View File

@@ -63,16 +63,15 @@ class CGuiTextProperties
{
friend class CGuiTextSupport;
bool x0_wordWrap;
bool x1_multiline;
bool x1_horizontal;
EJustification x4_justification;
EVerticalJustification x8_vertJustification;
ETextDirection xc_direction;
u32 xc_;
public:
CGuiTextProperties(bool wordWrap, bool multiline, EJustification justification,
EVerticalJustification vertJustification,
ETextDirection dir=ETextDirection::Horizontal)
: x0_wordWrap(wordWrap), x1_multiline(multiline), x4_justification(justification),
x8_vertJustification(vertJustification), xc_direction(dir) {}
CGuiTextProperties(bool wordWrap, bool horizontal, EJustification justification,
EVerticalJustification vertJustification, u32 unk=0)
: x0_wordWrap(wordWrap), x1_horizontal(horizontal), x4_justification(justification),
x8_vertJustification(vertJustification), xc_(unk) {}
};
class CGuiTextSupport
@@ -84,6 +83,7 @@ class CGuiTextSupport
zeus::CColor x24_fontColor;
zeus::CColor x28_outlineColor;
zeus::CColor x2c_geometryColor;
bool x30_imageBaseline = false;
s32 x34_extentX;
s32 x38_extentY;
float x3c_curTime = 0.f;
@@ -131,6 +131,9 @@ public:
void AddText(const std::u16string& str);
void SetText(const std::u16string& str, bool multipage=false);
void SetText(const std::string& str, bool multipage=false);
void SetJustification(EJustification j);
void SetVerticalJustification(EVerticalJustification j);
void SetImageBaseline(bool b);
bool GetIsTextSupportFinishedLoading() const;
};