RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

use only symbol bound rects for overlay merging. Circles can overlap

Browse source
This commit is contained in:
ExMix 2013-09-23 19:19:24 +03:00 • committed by Alex Zolotarev
parent 0bd1cf2af9
commit fc2426d373
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
graphics/circled_symbol.cpp
View file

@ -7,18 +7,6 @@ namespace graphics
: SymbolElement(symbolElement)
, m_circle(circleElement) {}
vector<m2::AnyRectD> const & CircledSymbol::boundRects() const
{
if (isDirtyRect())
{
SymbolElement::boundRects();
vector<m2::AnyRectD> circleBounds = m_circle.boundRects();
m_boundRects.insert(m_boundRects.end(), circleBounds.begin(), circleBounds.end());
}
return SymbolElement::boundRects();
}
void CircledSymbol::draw(OverlayRenderer * s, math::Matrix<double, 3, 3> const & m) const
{
m_circle.draw(s, m);

1
graphics/circled_symbol.hpp
View file

@ -11,7 +11,6 @@ namespace graphics
CircledSymbol(SymbolElement::Params const & symbolElement,
CircleElement::Params const & circleElement);
vector<m2::AnyRectD> const & boundRects() const;
void draw(OverlayRenderer * s, math::Matrix<double, 3, 3> const & m) const;
void setTransformation(const math::Matrix<double, 3, 3> & m);