AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-14 17:11:22 +00:00
Code Issues Projects Releases Wiki Activity

Update submodules

Browse Source
This commit is contained in:
Jack Andersen 2015-12-08 15:04:50 -10:00
parent 39c170fe47
commit a0fd8977f8
5 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Editor/ViewManager.cpp
View File

@ -15,10 +15,7 @@ struct SetTo1 : Specter::IButtonBinding
const std::string& help() const {return m_help;}
void pressed(const boo::SWindowCoord& coord)
{
m_vm.rootView().viewRes().resetPixelFactor(1.0);
m_vm.rootView().resetResources(m_vm.rootView().viewRes());
m_vm.ResetResources();
m_vm.rootView().updateSize();
m_vm.RequestPixelFactor(1.0);
}
};
@ -33,15 +30,29 @@ struct SetTo2 : Specter::IButtonBinding
const std::string& help() const {return m_help;}
void pressed(const boo::SWindowCoord& coord)
{
m_vm.rootView().viewRes().resetPixelFactor(2.0);
m_vm.rootView().resetResources(m_vm.rootView().viewRes());
m_vm.ResetResources();
m_vm.rootView().updateSize();
m_vm.RequestPixelFactor(2.0);
}
};
void ViewManager::ResetResources()
void ViewManager::SetupRootView()
{
m_rootView.reset(new Specter::RootView(*this, m_viewResources, m_mainWindow.get()));
Specter::SplitView* splitView = new Specter::SplitView(m_viewResources, *m_rootView, Specter::SplitView::Axis::Horizontal);
m_rootView->setContentView(std::unique_ptr<Specter::SplitView>(splitView));
m_space1 = new Specter::Space(m_viewResources, *splitView, Specter::Toolbar::Position::Top);
m_space1->toolbar().push_back(std::make_unique<Specter::Button>(m_viewResources, m_space1->toolbar(),
std::make_unique<SetTo1>(*this), "Hello Button"));
m_space2 = new Specter::Space(m_viewResources, *splitView, Specter::Toolbar::Position::Bottom);
m_space2->toolbar().push_back(std::make_unique<Specter::Button>(m_viewResources, m_space2->toolbar(),
std::make_unique<SetTo2>(*this), "こんにちはボタン"));
splitView->setContentView(0, std::unique_ptr<Specter::Space>(m_space1));
splitView->setContentView(1, std::unique_ptr<Specter::Space>(m_space2));
m_rootView->setBackground(Zeus::CColor::skGrey);
Specter::MultiLineTextView* textView1 = new Specter::MultiLineTextView(m_viewResources, *m_space1, m_viewResources.m_heading18);
m_space1->setContentView(std::unique_ptr<Specter::MultiLineTextView>(textView1));
@ -53,32 +64,8 @@ void ViewManager::ResetResources()
textView1->setBackground(m_viewResources.themeData().viewportBackground());
textView2->setBackground(m_viewResources.themeData().viewportBackground());
}
void ViewManager::SetupRootView()
{
m_rootView.reset(new Specter::RootView(*this, m_viewResources, m_mainWindow.get()));
Specter::SplitView* splitView = new Specter::SplitView(m_viewResources, *m_rootView, Specter::SplitView::Axis::Horizontal);
m_rootView->setContentView(std::unique_ptr<Specter::SplitView>(splitView));
m_test1 = m_cvarManager.newCVar("hello_button", "Help for Hello Button", false,
HECL::CVar::EFlags::Archive | HECL::CVar::EFlags::Editor);
m_space1 = new Specter::Space(m_viewResources, *splitView, Specter::Toolbar::Position::Top);
m_space1->toolbar().push_back(std::make_unique<Specter::Button>(m_viewResources, m_space1->toolbar(),
std::make_unique<SetTo1>(*this), "Hello Button"));
m_test2 = m_cvarManager.newCVar("hello_button_jp", "Help for Japanese Hello Button", false,
HECL::CVar::EFlags::Archive | HECL::CVar::EFlags::Editor);
m_space2 = new Specter::Space(m_viewResources, *splitView, Specter::Toolbar::Position::Bottom);
m_space2->toolbar().push_back(std::make_unique<Specter::Button>(m_viewResources, m_space2->toolbar(),
std::make_unique<SetTo2>(*this), "こんにちはボタン"));
splitView->setContentView(0, std::unique_ptr<Specter::Space>(m_space1));
splitView->setContentView(1, std::unique_ptr<Specter::Space>(m_space2));
m_rootView->setBackground(Zeus::CColor::skGrey);
ResetResources();
m_rootView->updateSize();
}
void ViewManager::init(boo::IApplication* app)
@ -103,12 +90,17 @@ bool ViewManager::proc()
boo::IGraphicsCommandQueue* gfxQ = m_mainWindow->getCommandQueue();
if (m_rootView->isDestroyed())
return false;
if (m_updatePf)
{
m_viewResources.resetPixelFactor(m_reqPf);
SetupRootView();
m_updatePf = false;
}
#if 0
if (m_cvPixelFactor->isModified())
{
float pixelFactor = m_cvPixelFactor->toFloat();
m_viewResources.resetPixelFactor(pixelFactor);
m_rootView->resetResources(m_viewResources);
m_cvPixelFactor->clearModified();
}
#endif

11
Editor/ViewManager.hpp
View File

@ -19,8 +19,9 @@ class ViewManager : Specter::IViewManager
Specter::Space* m_space2;
HECL::CVar* m_cvPixelFactor;
HECL::CVar* m_test1;
HECL::CVar* m_test2;
bool m_updatePf = false;
float m_reqPf;
void SetupRootView();
public:
@ -28,7 +29,11 @@ public:
: m_cvarManager(cvarMgr), m_fontCache(fileMgr) {}
Specter::RootView& rootView() const {return *m_rootView;}
void ResetResources();
void RequestPixelFactor(float pf)
{
m_reqPf = pf;
m_updatePf = true;
}
void init(boo::IApplication* app);
bool proc();

1
Editor/locale/locale.cpp
View File

@ -1,6 +1,7 @@
#include "locale.hpp"
#include <cstring>
#include <clocale>
#include <algorithm>
extern "C" const uint8_t L_en_US[];
extern "C" size_t L_en_US_SZ;

2
hecl

@ -1 +1 @@
Subproject commit c56e96bf3e47e53ab633c987968089e9140dc745
Subproject commit aecc64002bac17253ecd2bc9c7a423a9201b3dc7

2
libSpecter

@ -1 +1 @@
Subproject commit e3be0e248fa22982c217c5dc91c1e03914afb0ae
Subproject commit 4d8e33e98170fa66907c829457893c800c3082dc