diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-02-29 10:47:55 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:49:23 +0300 |
| commit | 098804292d82f724bd2bb6daef2d98e67d4e29e0 (patch) | |
| tree | a55e27a1b2f798f315b5bcb057dd97f253916c13 /drape | |
| parent | 3593f5126eaa1ba811454ce942d7771e1b76796e (diff) | |
Review fixes
Diffstat (limited to 'drape')
| -rw-r--r-- | drape/overlay_handle.cpp | 4 | ||||
| -rw-r--r-- | drape/overlay_handle.hpp | 4 | ||||
| -rw-r--r-- | drape/overlay_tree.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drape/overlay_handle.cpp b/drape/overlay_handle.cpp index fb9ea1d419..0bcd2b514c 100644 --- a/drape/overlay_handle.cpp +++ b/drape/overlay_handle.cpp @@ -159,7 +159,7 @@ OverlayHandle::Rects const & OverlayHandle::GetExtendedPixelShape(ScreenBase con return m_extendedShapeCache; m_extendedShapeCache.clear(); - GetPixelShape(screen, m_extendedShapeCache, screen.isPerspective()); + GetPixelShape(screen, screen.isPerspective(), m_extendedShapeCache); for (auto & rect : m_extendedShapeCache) rect.Inflate(m_extendingSize, m_extendingSize); m_extendedShapeDirty = false; @@ -236,7 +236,7 @@ m2::RectD SquareHandle::GetPixelRect(ScreenBase const & screen, bool perspective return result; } -void SquareHandle::GetPixelShape(ScreenBase const & screen, Rects & rects, bool perspective) const +void SquareHandle::GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const { rects.emplace_back(GetPixelRect(screen, perspective)); } diff --git a/drape/overlay_handle.hpp b/drape/overlay_handle.hpp index e26f821e2f..ce6bb1fcbb 100644 --- a/drape/overlay_handle.hpp +++ b/drape/overlay_handle.hpp @@ -56,7 +56,7 @@ public: virtual bool Update(ScreenBase const & /*screen*/) { return true; } virtual m2::RectD GetPixelRect(ScreenBase const & screen, bool perspective) const = 0; - virtual void GetPixelShape(ScreenBase const & screen, Rects & rects, bool perspective) const = 0; + virtual void GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const = 0; double GetPivotZ() const { return m_pivotZ; } void SetPivotZ(double pivotZ) { m_pivotZ = pivotZ; } @@ -148,7 +148,7 @@ public: bool isBillboard = false); m2::RectD GetPixelRect(ScreenBase const & screen, bool perspective) const override; - void GetPixelShape(ScreenBase const & screen, Rects & rects, bool perspective) const override; + void GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const override; #ifdef DEBUG_OVERLAYS_OUTPUT virtual string GetOverlayDebugInfo() override; diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp index 893b15c44c..43e3888885 100644 --- a/drape/overlay_tree.cpp +++ b/drape/overlay_tree.cpp @@ -365,7 +365,7 @@ void OverlayTree::Select(m2::RectD const & rect, TOverlayContainer & result) con if (h->IsVisible() && h->GetFeatureID().IsValid()) { OverlayHandle::Rects shape; - h->GetPixelShape(screen, shape, screen.isPerspective()); + h->GetPixelShape(screen, screen.isPerspective(), shape); for (m2::RectF const & rShape : shape) { if (rShape.IsIntersect(m2::RectF(rect))) |