2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 18:27:42 +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

@@ -7,8 +7,7 @@
#include "CSaveableState.hpp"
#include "IOStreams.hpp"
namespace urde
{
namespace urde {
class CGuiObject;
class CVParamTransfer;
struct SObjectTag;
@@ -19,34 +18,31 @@ class CGuiFrame;
class CTextParser;
class CTextExecuteBuffer;
class CGuiSys
{
friend class CGuiFrame;
class CGuiSys {
friend class CGuiFrame;
public:
enum class EUsageMode
{
Zero,
One,
Two
};
enum class EUsageMode { Zero, One, Two };
private:
IFactory& x0_resFactory;
CSimplePool& x4_resStore;
EUsageMode x8_mode;
std::unique_ptr<CTextExecuteBuffer> xc_textExecuteBuf;
std::unique_ptr<CTextParser> x10_textParser;
std::unordered_set<CGuiFrame*> m_registeredFrames;
IFactory& x0_resFactory;
CSimplePool& x4_resStore;
EUsageMode x8_mode;
std::unique_ptr<CTextExecuteBuffer> xc_textExecuteBuf;
std::unique_ptr<CTextParser> x10_textParser;
std::unordered_set<CGuiFrame*> m_registeredFrames;
static std::shared_ptr<CGuiWidget> CreateWidgetInGame(FourCC type, CInputStream& in, CGuiFrame* frame,
CSimplePool* sp);
static std::shared_ptr<CGuiWidget> CreateWidgetInGame(FourCC type, CInputStream& in,
CGuiFrame* frame, CSimplePool* sp);
public:
CGuiSys(IFactory& resFactory, CSimplePool& resStore, EUsageMode mode);
CGuiSys(IFactory& resFactory, CSimplePool& resStore, EUsageMode mode);
CSimplePool& GetResStore() {return x4_resStore;}
EUsageMode GetUsageMode() const {return x8_mode;}
CSimplePool& GetResStore() { return x4_resStore; }
EUsageMode GetUsageMode() const { return x8_mode; }
void OnViewportResize();
static void ViewportResizeFrame(CGuiFrame* frame);
void OnViewportResize();
static void ViewportResizeFrame(CGuiFrame* frame);
};
/** Global GuiSys instance */
@@ -58,5 +54,4 @@ extern CTextExecuteBuffer* g_TextExecuteBuf;
/** Global CTextParser instance */
extern CTextParser* g_TextParser;
}
} // namespace urde