2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 15:47:46 +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,72 +4,52 @@
#include "ViewManager.hpp"
#include "Runtime/IMain.hpp"
namespace urde
{
class GameMode : public ViewerSpace
{
std::shared_ptr<IMain> m_main;
namespace urde {
class GameMode : public ViewerSpace {
std::shared_ptr<IMain> m_main;
struct State : Space::State
{
AT_DECL_DNA_YAML
AT_DECL_DNAV
Value<bool> showToolbar = true;
} m_state;
struct State : Space::State {
AT_DECL_DNA_YAML
AT_DECL_DNAV
Value<bool> showToolbar = true;
} m_state;
const Space::State& spaceState() const { return m_state; }
const Space::State& spaceState() const { return m_state; }
struct View : specter::View
{
GameMode& m_gMode;
struct View : specter::View {
GameMode& m_gMode;
View(GameMode& gMode, specter::ViewResources& res)
: specter::View(res, gMode.m_vm.rootView()), m_gMode(gMode) {}
View(GameMode& gMode, specter::ViewResources& res) : specter::View(res, gMode.m_vm.rootView()), m_gMode(gMode) {}
void draw(boo::IGraphicsCommandQueue *gfxQ);
};
void draw(boo::IGraphicsCommandQueue* gfxQ);
};
std::unique_ptr<View> m_view;
std::unique_ptr<View> m_view;
public:
GameMode(ViewManager& vm, Space* parent)
: ViewerSpace(vm, Class::GameMode, parent)
{
reloadState();
}
GameMode(ViewManager& vm, Space* parent) : ViewerSpace(vm, Class::GameMode, parent) { reloadState(); }
GameMode(ViewManager& vm, Space* parent, const GameMode& other)
: GameMode(vm, parent)
{
m_state = other.m_state;
reloadState();
}
GameMode(ViewManager& vm, Space* parent, const GameMode& other) : GameMode(vm, parent) {
m_state = other.m_state;
reloadState();
}
GameMode(ViewManager& vm, Space* parent, ConfigReader& r)
: GameMode(vm, parent)
{
m_state.read(r);
reloadState();
}
GameMode(ViewManager& vm, Space* parent, ConfigReader& r) : GameMode(vm, parent) {
m_state.read(r);
reloadState();
}
void reloadState()
{
}
void reloadState() {}
virtual specter::View* buildContentView(specter::ViewResources &res)
{
m_view.reset(new View(*this, res));
return m_view.get();
}
virtual specter::View* buildContentView(specter::ViewResources& res) {
m_view.reset(new View(*this, res));
return m_view.get();
}
void think();
void think();
Space* copy(Space *parent) const
{
return new GameMode(m_vm, parent, *this);
}
Space* copy(Space* parent) const { return new GameMode(m_vm, parent, *this); }
bool usesToolbar() const { return m_state.showToolbar; }
bool usesToolbar() const { return m_state.showToolbar; }
};
}
} // namespace urde