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-07 15:49:54 -10:00
parent 9d6b1ba8f4
commit ae4fe6cb98
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Editor/ViewManager.cpp
View File

@ -42,12 +42,12 @@ void ViewManager::init(boo::IApplication* app)
m_mainWindow->showWindow();
m_mainWindow->setWaitCursor(true);
unsigned dpi = m_mainWindow->getVirtualPixelFactor() * 72;
m_cvDPI = m_cvarManager.newCVar("ed_dpi", "User-selected UI DPI",
int(dpi), HECL::CVar::EFlags::Editor | HECL::CVar::EFlags::Archive);
float pixelFactor = 1.0;
m_cvPixelFactor = m_cvarManager.newCVar("ed_pixelfactor", "User-selected UI Scale",
pixelFactor, HECL::CVar::EFlags::Editor | HECL::CVar::EFlags::Archive);
boo::IGraphicsDataFactory* gf = m_mainWindow->getMainContextDataFactory();
m_viewResources.init(gf, &m_fontCache, Specter::ThemeData(), dpi);
m_viewResources.init(gf, &m_fontCache, Specter::ThemeData(), pixelFactor);
SetupRootView();
m_mainWindow->setWaitCursor(false);
@ -58,15 +58,15 @@ bool ViewManager::proc()
boo::IGraphicsCommandQueue* gfxQ = m_mainWindow->getCommandQueue();
if (m_rootView->isDestroyed())
return false;
if (m_cvDPI->isModified())
#if 0
if (m_cvPixelFactor->isModified())
{
unsigned dpi = m_cvDPI->toInteger();
m_viewResources.resetDPI(dpi);
float pixelFactor = m_cvPixelFactor->toFloat();
m_viewResources.resetPixelFactor(pixelFactor);
m_rootView->resetResources(m_viewResources);
m_cvDPI->clearModified();
m_cvPixelFactor->clearModified();
}
#endif
m_rootView->dispatchEvents();
m_rootView->draw(gfxQ);
gfxQ->execute();

2
Editor/ViewManager.hpp
View File

@ -15,7 +15,7 @@ class ViewManager : Specter::IViewManager
std::unique_ptr<boo::IWindow> m_mainWindow;
std::unique_ptr<Specter::RootView> m_rootView;
HECL::CVar* m_cvDPI;
HECL::CVar* m_cvPixelFactor;
HECL::CVar* m_test1;
HECL::CVar* m_test2;

2
hecl

@ -1 +1 @@
Subproject commit 3f086adc236518b6babb9d00b98fd51c0163f086
Subproject commit 66387d8e4620334801e571485a1f489b95b546fb

2
libSpecter

@ -1 +1 @@
Subproject commit 5b5f8c540a955e7401218b0216616dee189282d3
Subproject commit 7a3177c8c8e28751c1fca170799e2fdd6c76e360