AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add space switching

This commit is contained in:
Phillip Stephens 2016-07-08 18:23:34 -07:00
parent 8b1f70c5cd
commit 4f401acdca
5 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Editor/ModelViewer.cpp
View File

@ -9,17 +9,6 @@ void ModelViewer::View::resized(const boo::SWindowRect& root, const boo::SWindow
m_scissorRect = sub; m_scissorRect = sub;
} }
void ModelViewer::View::draw(boo::IGraphicsCommandQueue* gfxQ)
{
gfxQ->setScissor(m_scissorRect);
m_mv.m_lineRenderer->Reset();
m_mv.m_lineRenderer->AddVertex({-0.5f, 0.f, -0.5f}, zeus::CColor::skBlue, 1.f);
m_mv.m_lineRenderer->AddVertex({-0.5f, 0.f, 0.5f}, zeus::CColor::skBlue, 1.f);
m_mv.m_lineRenderer->AddVertex({0.5f, 10.f, 0.5f}, zeus::CColor::skRed, 3.f);
m_mv.m_lineRenderer->AddVertex({0.5f, 0.f, -0.5f}, zeus::CColor::skBlue, 1.f);
m_mv.m_lineRenderer->Render();
gfxQ->setScissor({});
}
} }

1
Editor/ModelViewer.hpp
View File

@ -36,7 +36,6 @@ class ModelViewer : public ViewerSpace
: specter::View(res, mv.m_vm.rootView()), m_mv(mv) {} : specter::View(res, mv.m_vm.rootView()), m_mv(mv) {}
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub); void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub);
void draw(boo::IGraphicsCommandQueue *gfxQ);
}; };
Camera m_camera; Camera m_camera;

2
Editor/ParticleEditor.hpp
View File

@ -38,6 +38,8 @@ public:
{ {
return new EffectEditor(m_vm, parent, *this); return new EffectEditor(m_vm, parent, *this);
} }
bool usesToolbar() const { return true; }
}; };
} }

19
Editor/Space.cpp
View File

@ -238,4 +238,23 @@ RootSpace* Space::NewRootSpaceFromConfigStream(ViewManager& vm, ConfigReader& r)
return new RootSpace(vm, r); return new RootSpace(vm, r);
} }
void Space::SpaceMenuNode::SubNode::activated(const boo::SWindowCoord &coord)
{
std::unique_ptr<Space> newSpace;
switch(m_data.m_cls)
{
case Class::InformationCenter: newSpace.reset(new InformationCenter(m_space.m_parent->m_vm, m_space.m_parent)); break;
case Class::EffectEditor: newSpace.reset(new EffectEditor(m_space.m_parent->m_vm, m_space.m_parent)); break;
case Class::ResourceBrowser: newSpace.reset(new ResourceBrowser(m_space.m_parent->m_vm, m_space.m_parent)); break;
case Class::ModelViewer: newSpace.reset(new ModelViewer(m_space.m_parent->m_vm, m_space.m_parent)); break;
default: break;
}
if (newSpace)
{
Space* parent = m_space.m_parent;
m_space.m_parent->exchangeSpaceSplitJoin(&m_space, std::move(newSpace));
parent->m_vm.BuildSpaceViews();
}
}
} }

2
Editor/Space.hpp
View File

@ -64,7 +64,7 @@ public:
Space& m_space; Space& m_space;
const SubNodeData& m_data; const SubNodeData& m_data;
const std::string* text() const {return &m_data.m_text;} const std::string* text() const {return &m_data.m_text;}
void activated(const boo::SWindowCoord& coord) {} void activated(const boo::SWindowCoord& coord);
SubNode(Space& space, const SubNodeData& data) : m_space(space), m_data(data) {} SubNode(Space& space, const SubNodeData& data) : m_space(space), m_data(data) {}
}; };