2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 02:27:43 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -4,37 +4,35 @@
#include "CSaveableState.hpp"
#include "CDrawStringOptions.hpp"
namespace urde
{
namespace urde {
class CLineInstruction;
class CBlockInstruction;
class CFontRenderState : public CSaveableState
{
friend class CLineInstruction;
friend class CBlockInstruction;
friend class CTextInstruction;
friend class CImageInstruction;
friend class CWordInstruction;
class CFontRenderState : public CSaveableState {
friend class CLineInstruction;
friend class CBlockInstruction;
friend class CTextInstruction;
friend class CImageInstruction;
friend class CWordInstruction;
CBlockInstruction* x88_curBlock = nullptr;
CDrawStringOptions x8c_drawOpts;
s32 xd4_curX = 0;
s32 xd8_curY = 0;
const CLineInstruction* xdc_currentLineInst = nullptr;
std::vector<u32> xe8_;
std::vector<u8> xf8_;
bool x108_lineInitialized = true;
std::list<CSaveableState> x10c_pushedStates;
CBlockInstruction* x88_curBlock = nullptr;
CDrawStringOptions x8c_drawOpts;
s32 xd4_curX = 0;
s32 xd8_curY = 0;
const CLineInstruction* xdc_currentLineInst = nullptr;
std::vector<u32> xe8_;
std::vector<u8> xf8_;
bool x108_lineInitialized = true;
std::list<CSaveableState> x10c_pushedStates;
public:
CFontRenderState();
zeus::CColor ConvertToTextureSpace(const CTextColor& col) const;
void PopState();
void PushState();
void SetColor(EColorType tp, const CTextColor& col);
void RefreshPalette();
void RefreshColor(EColorType tp);
CFontRenderState();
zeus::CColor ConvertToTextureSpace(const CTextColor& col) const;
void PopState();
void PushState();
void SetColor(EColorType tp, const CTextColor& col);
void RefreshPalette();
void RefreshColor(EColorType tp);
};
}
} // namespace urde