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

Update submodules

This commit is contained in:
Jack Andersen 2015-12-03 15:35:26 -10:00
parent f441220404
commit f869ba7fca
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Editor/main.cpp
View File

@ -34,7 +34,7 @@ struct Application : boo::IApplicationCallback
int(dpi), HECL::CVar::EFlags::Editor); int(dpi), HECL::CVar::EFlags::Editor);
boo::IGraphicsDataFactory* gf = m_mainWindow->getMainContextDataFactory(); boo::IGraphicsDataFactory* gf = m_mainWindow->getMainContextDataFactory();
m_viewResources.init(gf, &m_fontCache, dpi); m_viewResources.init(gf, &m_fontCache, Specter::ThemeData(), dpi);
m_rootView.reset(new Specter::RootView(m_viewResources, m_mainWindow)); m_rootView.reset(new Specter::RootView(m_viewResources, m_mainWindow));
m_mainWindow->setWaitCursor(false); m_mainWindow->setWaitCursor(false);
@ -46,7 +46,8 @@ struct Application : boo::IApplicationCallback
if (cvDPI->isModified()) if (cvDPI->isModified())
{ {
dpi = cvDPI->toInteger(); dpi = cvDPI->toInteger();
m_viewResources.init(gf, &m_fontCache, dpi); m_viewResources.resetDPI(dpi);
m_rootView->resetResources(m_viewResources);
cvDPI->clearModified(); cvDPI->clearModified();
} }
m_rootView->dispatchEvents(); m_rootView->dispatchEvents();
@ -80,7 +81,7 @@ int main(int argc, const boo::SystemChar** argv)
LogVisor::RegisterConsoleLogger(); LogVisor::RegisterConsoleLogger();
RUDE::Application appCb; RUDE::Application appCb;
int ret = ApplicationRun(boo::IApplication::EPlatformType::Auto, int ret = ApplicationRun(boo::IApplication::EPlatformType::Auto,
appCb, _S("rude"), _S("RUDE"), argc, argv); appCb, _S("rude"), _S("RUDE"), argc, argv, false);
printf("IM DYING!!\n"); printf("IM DYING!!\n");
return ret; return ret;
} }

2
hecl

@ -1 +1 @@
Subproject commit 7bbe4278b5fc7c700c746896b9b758d534a9301e Subproject commit 1cdcaa7120afaab130abcf98911fee59b4e5cb30

2
libSpecter

@ -1 +1 @@
Subproject commit 0354ff796aae39ac57062bc548d2a74b6c3c2bf1 Subproject commit a112732fb59abb619c90bc4b002194b7f9b61680