kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Code style fixes.

Browse source
This commit is contained in:
vng 2012-09-20 18:48:24 +03:00 • committed by Alex Zolotarev
parent 591a3633ba
commit 52ef202674
11 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
map/drawer_yg.cpp
View file

@ -51,7 +51,7 @@ void di::DrawRule::SetID(size_t threadID, uint32_t id) const
m_transparent ? m_rule->SetID2(threadID, id) : m_rule->SetID(threadID, id);
}
DrawerYG::DrawerYG(params_t const & params)
DrawerYG::DrawerYG(Params const & params)
: m_visualScale(params.m_visualScale), m_threadID(params.m_threadID)
{
m_pScreen = shared_ptr<yg::gl::Screen>(new yg::gl::Screen(params));

8
map/drawer_yg.hpp
View file

@ -92,9 +92,7 @@ protected:
typedef shared_ptr<yg::gl::FrameBuffer> frame_buffer_t;
public:
typedef yg::gl::Screen screen_t;
struct Params : screen_t::Params
struct Params : yg::gl::Screen::Params
{
size_t m_threadID;
double m_visualScale;
@ -102,9 +100,7 @@ public:
Params();
};
typedef Params params_t;
DrawerYG(params_t const & params = params_t());
DrawerYG(Params const & params = Params());
void drawSymbol(m2::PointD const & pt, string const & symbolName, yg::EPosition pos, int depth);

2
map/render_policy_mt.cpp
View file

@ -116,7 +116,7 @@ RenderPolicyMT::RenderPolicyMT(RenderPolicy::Params const & p)
GetPlatform().GetFontNames(fonts);
m_resourceManager->addFonts(fonts);
DrawerYG::params_t dp;
DrawerYG::Params dp;
dp.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB));
dp.m_resourceManager = m_resourceManager;

2
map/render_policy_st.cpp
View file

@ -118,7 +118,7 @@ RenderPolicyST::RenderPolicyST(Params const & p)
GetPlatform().GetFontNames(fonts);
m_resourceManager->addFonts(fonts);
DrawerYG::params_t dp;
DrawerYG::Params dp;
dp.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB));
dp.m_resourceManager = m_resourceManager;

2
map/render_queue_routine.cpp
View file

@ -260,7 +260,7 @@ void RenderQueueRoutine::Do()
if (!m_glQueue)
m_renderContext->makeCurrent();
DrawerYG::params_t params;
DrawerYG::Params params;
params.m_resourceManager = m_resourceManager;
params.m_frameBuffer = m_frameBuffer;

2
map/simple_render_policy.cpp
View file

@ -95,7 +95,7 @@ SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
GetPlatform().GetFontNames(fonts);
m_resourceManager->addFonts(fonts);
DrawerYG::params_t dp;
DrawerYG::Params dp;
dp.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB));
dp.m_resourceManager = m_resourceManager;

2
map/test_render_policy.cpp
View file

@ -97,7 +97,7 @@ TestRenderPolicy::TestRenderPolicy(Params const & p)
GetPlatform().GetFontNames(fonts);
m_resourceManager->addFonts(fonts);
DrawerYG::params_t dp;
DrawerYG::Params dp;
m_primaryFrameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB));

2
map/tile_renderer.cpp
View file

@ -49,7 +49,7 @@ TileRenderer::TileRenderer(
for (unsigned i = 0; i < m_threadData.size(); ++i)
{
DrawerYG::params_t params;
DrawerYG::Params params;
params.m_resourceManager = m_resourceManager;
params.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer());

2
map/tile_renderer.hpp
View file

@ -40,7 +40,7 @@ protected:
struct ThreadData
{
DrawerYG * m_drawer;
DrawerYG::params_t m_drawerParams;
DrawerYG::Params m_drawerParams;
shared_ptr<yg::gl::BaseTexture> m_dummyRT;
shared_ptr<yg::gl::RenderContext> m_renderContext;
shared_ptr<yg::gl::RenderBuffer> m_depthBuffer;

2
map/tiling_render_policy_mt.cpp
View file

@ -130,7 +130,7 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
GetPlatform().GetFontNames(fonts);
m_resourceManager->addFonts(fonts);
DrawerYG::params_t dp;
DrawerYG::Params dp;
dp.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB));
dp.m_resourceManager = m_resourceManager;

2
map/tiling_render_policy_st.cpp
View file

@ -145,7 +145,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
GetPlatform().GetFontNames(fonts);
m_resourceManager->addFonts(fonts);
DrawerYG::params_t dp;
DrawerYG::Params dp;
dp.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB));
dp.m_resourceManager = m_resourceManager;