diff options
| author | Constantin Shalnev <c.shalnev@corp.mail.ru> | 2015-08-19 17:31:37 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 03:01:55 +0300 |
| commit | 9fe1cc12c101d60a3e10c8ce44ab35bba0ea7d68 (patch) | |
| tree | 091f4df20f900cfa54bd47da133873fb846bfbb8 /render | |
| parent | 487a28e33e7f2f4f4f26aeaffcdac379bfd0078b (diff) | |
Added background color support for software renderer
Diffstat (limited to 'render')
| -rw-r--r-- | render/cpu_drawer.cpp | 4 | ||||
| -rw-r--r-- | render/cpu_drawer.hpp | 2 | ||||
| -rw-r--r-- | render/software_renderer.cpp | 5 | ||||
| -rw-r--r-- | render/software_renderer.hpp | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/render/cpu_drawer.cpp b/render/cpu_drawer.cpp index eca1dcce6f..177f41c110 100644 --- a/render/cpu_drawer.cpp +++ b/render/cpu_drawer.cpp @@ -172,9 +172,9 @@ CPUDrawer::CPUDrawer(Params const & params) { } -void CPUDrawer::BeginFrame(uint32_t width, uint32_t height) +void CPUDrawer::BeginFrame(uint32_t width, uint32_t height, graphics::Color const & bgColor) { - m_renderer->BeginFrame(width, height); + m_renderer->BeginFrame(width, height, bgColor); } void CPUDrawer::Flush() diff --git a/render/cpu_drawer.hpp b/render/cpu_drawer.hpp index c38b42faa8..969c43b709 100644 --- a/render/cpu_drawer.hpp +++ b/render/cpu_drawer.hpp @@ -25,7 +25,7 @@ public: CPUDrawer(Params const & params); - void BeginFrame(uint32_t width, uint32_t height); + void BeginFrame(uint32_t width, uint32_t height, graphics::Color const & bgColor); void Flush(); void DrawMyPosition(m2::PointD const & myPxPotision); void DrawSearchResult(m2::PointD const & pxPosition); diff --git a/render/software_renderer.cpp b/render/software_renderer.cpp index 152642cc8b..4335bfd3ff 100644 --- a/render/software_renderer.cpp +++ b/render/software_renderer.cpp @@ -180,7 +180,7 @@ SoftwareRenderer::SoftwareRenderer(graphics::GlyphCache::Params const & glyphCac ASSERT(m_skinWidth != 0 && m_skinHeight != 0, ()); } -void SoftwareRenderer::BeginFrame(uint32_t width, uint32_t height) +void SoftwareRenderer::BeginFrame(uint32_t width, uint32_t height, graphics::Color const & bgColor) { ASSERT(m_frameWidth == 0 && m_frameHeight == 0, ()); m_frameWidth = width; @@ -195,8 +195,7 @@ void SoftwareRenderer::BeginFrame(uint32_t width, uint32_t height) m_baseRenderer.reset_clipping(true); unsigned op = m_pixelFormat.comp_op(); m_pixelFormat.comp_op(agg::comp_op_src); - graphics::Color c = ConvertColor(drule::rules().GetBgColor()); - m_baseRenderer.clear(agg::rgba8(c.r, c.g, c.b, c.a)); + m_baseRenderer.clear(agg::rgba8(bgColor.r, bgColor.g, bgColor.b, bgColor.a)); m_pixelFormat.comp_op(op); } diff --git a/render/software_renderer.hpp b/render/software_renderer.hpp index 1c77ade30a..6d91c16f72 100644 --- a/render/software_renderer.hpp +++ b/render/software_renderer.hpp @@ -33,7 +33,7 @@ class SoftwareRenderer public: SoftwareRenderer(graphics::GlyphCache::Params const & glyphCacheParams, graphics::EDensity density); - void BeginFrame(uint32_t width, uint32_t height); + void BeginFrame(uint32_t width, uint32_t height, graphics::Color const & bgColor); void DrawSymbol(m2::PointD const & pt, graphics::EPosition anchor, graphics::Icon::Info const & info); |