diff options
| author | vng <viktor.govako@gmail.com> | 2013-05-29 15:45:32 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:55:34 +0300 |
| commit | be7a21e6ed78e1c3f457d6a801a62f0af632f24d (patch) | |
| tree | dfb0c2c16d2b58a4bb50a04e4d48aa0378c282ec /qt_tstfrm | |
| parent | 3f35306ff163a0e280c0859d79dbfb7d2916c8ce (diff) | |
Read .skn file and static texture once in main thread.
Diffstat (limited to 'qt_tstfrm')
| -rw-r--r-- | qt_tstfrm/gui_test_widget.hpp | 2 | ||||
| -rw-r--r-- | qt_tstfrm/tstwidgets.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/qt_tstfrm/gui_test_widget.hpp b/qt_tstfrm/gui_test_widget.hpp index 24ffe14241..3e1ffb6747 100644 --- a/qt_tstfrm/gui_test_widget.hpp +++ b/qt_tstfrm/gui_test_widget.hpp @@ -55,11 +55,9 @@ public: cp.m_threadSlot = 0; cp.m_storageType = graphics::ETinyStorage; cp.m_textureType = graphics::ESmallTexture; - cp.m_skinName = "basic.skn"; cp.m_isSynchronized = false; cp.m_resourceManager = base_t::m_resourceManager; cp.m_renderContext = base_t::m_primaryContext; - cp.m_density = graphics::EDensityMDPI; m_cacheScreen = make_shared_ptr(new graphics::Screen(cp)); diff --git a/qt_tstfrm/tstwidgets.cpp b/qt_tstfrm/tstwidgets.cpp index 2036381d4d..10e2500083 100644 --- a/qt_tstfrm/tstwidgets.cpp +++ b/qt_tstfrm/tstwidgets.cpp @@ -116,7 +116,7 @@ namespace tst rmp.m_useSingleThreadedOGL = false; - m_resourceManager.reset(new graphics::ResourceManager(rmp)); + m_resourceManager.reset(new graphics::ResourceManager(rmp, "basic.skn", graphics::EDensityMDPI)); m_primaryContext->setResourceManager(m_resourceManager); m_primaryContext->startThreadDrawing(0); @@ -133,8 +133,6 @@ namespace tst params.m_resourceManager = m_resourceManager; params.m_threadSlot = m_resourceManager->guiThreadSlot(); params.m_renderContext = m_primaryContext; - params.m_skinName = "basic.skn"; - params.m_density = graphics::EDensityMDPI; m_primaryScreen = make_shared_ptr(new graphics::Screen(params)); } |