diff options
| author | rachytski <siarhei.rachytski@gmail.com> | 2012-05-12 20:35:38 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:38:23 +0300 |
| commit | e17d25ab7c3ffd5a7d51b1043ff5064aeef359a1 (patch) | |
| tree | 8bf77a920784e4591a865a07eef76e441ce9d35b /map/tiling_render_policy_mt.cpp | |
| parent | 58e55db2d7175e5649e1890aa53d1ad590af9dc3 (diff) | |
refactored RenderPolicies to accept visualScale, skinName and screenSize among other parameters. removed Platform::VisualScale, *::SkinName and *::TileSize.
Diffstat (limited to 'map/tiling_render_policy_mt.cpp')
| -rw-r--r-- | map/tiling_render_policy_mt.cpp | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/map/tiling_render_policy_mt.cpp b/map/tiling_render_policy_mt.cpp index 07c3eb5dc9..358b088851 100644 --- a/map/tiling_render_policy_mt.cpp +++ b/map/tiling_render_policy_mt.cpp @@ -8,15 +8,12 @@ #include "tile_renderer.hpp" #include "coverage_generator.hpp" -TilingRenderPolicyMT::TilingRenderPolicyMT(VideoTimer * videoTimer, - bool useDefaultFB, - yg::ResourceManager::Params const & rmParams, - shared_ptr<yg::gl::RenderContext> const & primaryRC) - : BasicTilingRenderPolicy(primaryRC, +TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p) + : BasicTilingRenderPolicy(p, false, false) { - yg::ResourceManager::Params rmp = rmParams; + yg::ResourceManager::Params rmp = p.m_rmParams; rmp.checkDeviceCaps(); @@ -80,8 +77,8 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(VideoTimer * videoTimer, false, true); - rmp.m_renderTargetTexturesParams = yg::ResourceManager::TexturePoolParams(GetPlatform().TileSize(), - GetPlatform().TileSize(), + rmp.m_renderTargetTexturesParams = yg::ResourceManager::TexturePoolParams(TileSize(), + TileSize(), 1, rmp.m_texRtFormat, true, @@ -133,24 +130,24 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(VideoTimer * videoTimer, GetPlatform().GetFontNames(fonts); m_resourceManager->addFonts(fonts); - DrawerYG::params_t p; + DrawerYG::params_t dp; - p.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(useDefaultFB)); - p.m_resourceManager = m_resourceManager; - p.m_glyphCacheID = m_resourceManager->guiThreadGlyphCacheID(); - p.m_skinName = GetPlatform().SkinName(); - p.m_visualScale = GetPlatform().VisualScale(); - p.m_useGuiResources = true; - p.m_isSynchronized = false; + dp.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB)); + dp.m_resourceManager = m_resourceManager; + dp.m_glyphCacheID = m_resourceManager->guiThreadGlyphCacheID(); + dp.m_skinName = SkinName(); + dp.m_visualScale = VisualScale(); + dp.m_useGuiResources = true; + dp.m_isSynchronized = false; - m_drawer.reset(new DrawerYG(p)); + m_drawer.reset(new DrawerYG(dp)); m_windowHandle.reset(new WindowHandle()); m_windowHandle->setUpdatesEnabled(false); m_windowHandle->setRenderPolicy(this); - m_windowHandle->setVideoTimer(videoTimer); - m_windowHandle->setRenderContext(primaryRC); + m_windowHandle->setVideoTimer(p.m_videoTimer); + m_windowHandle->setRenderContext(p.m_primaryRC); } TilingRenderPolicyMT::~TilingRenderPolicyMT() @@ -170,15 +167,16 @@ TilingRenderPolicyMT::~TilingRenderPolicyMT() void TilingRenderPolicyMT::SetRenderFn(TRenderFn renderFn) { - string skinName = GetPlatform().SkinName(); + string skinName = SkinName(); - m_TileRenderer.reset(new TileRenderer(skinName, + m_TileRenderer.reset(new TileRenderer(TileSize(), + skinName, GetPlatform().CpuCores(), m_bgColor, renderFn, m_primaryRC, m_resourceManager, - GetPlatform().VisualScale(), + VisualScale(), 0)); m_CoverageGenerator.reset(new CoverageGenerator(skinName, |