diff options
| author | rachytski <siarhei.rachytski@gmail.com> | 2012-12-18 14:40:30 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:48:04 +0300 |
| commit | c44578fca5db273e8b01e6bbc43dde188220337a (patch) | |
| tree | 6e16bef373f5e5ee99fdca31af1bc8259175c249 /qt_tstfrm | |
| parent | 3e98f346b4515a41089ecfc216f839e837de3868 (diff) | |
refactored GeometryBatcher to derive it from PipelinesManager.
Diffstat (limited to 'qt_tstfrm')
| -rw-r--r-- | qt_tstfrm/tstwidgets.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qt_tstfrm/tstwidgets.cpp b/qt_tstfrm/tstwidgets.cpp index 5120ca837a..ead01139e2 100644 --- a/qt_tstfrm/tstwidgets.cpp +++ b/qt_tstfrm/tstwidgets.cpp @@ -3,7 +3,6 @@ #include "screen_qt.hpp" #include "../graphics/screen.hpp" -#include "../graphics/skin.hpp" #include "../graphics/resource_manager.hpp" #include "../graphics/opengl/utils.hpp" @@ -124,14 +123,12 @@ void GLDrawWidget::initializeGL() params.m_frameBuffer = m_frameBuffer; params.m_threadSlot = m_resourceManager->guiThreadSlot(); params.m_renderContext = m_primaryContext; + params.m_skinName = "basic_mdpi.skn"; m_p = make_shared_ptr(new graphics::Screen(params)); m_primaryFrameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer(true)); - m_skin = shared_ptr<graphics::Skin>(loadSkin(m_resourceManager, "basic_mdpi.skn")); - m_p->setSkin(m_skin); - params.m_frameBuffer = m_primaryFrameBuffer; m_primaryScreen = make_shared_ptr(new graphics::Screen(params)); } |