diff options
| author | Roman Sorokin <sorok-roma@yandex.ru> | 2014-08-20 19:05:55 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:25:19 +0300 |
| commit | 36e822e9d72a6757c8056f22e35b6df43aa941db (patch) | |
| tree | 23260b143cf708eac55b698ef48bbecfaa6792d7 /drape/overlay_handle.hpp | |
| parent | d67ba2de4a16237517eb76fbf6a0acd07eb8fb56 (diff) | |
Changed interface of GetPixelShape
Diffstat (limited to 'drape/overlay_handle.hpp')
| -rw-r--r-- | drape/overlay_handle.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drape/overlay_handle.hpp b/drape/overlay_handle.hpp index 841c77f0ba..164ec5a53d 100644 --- a/drape/overlay_handle.hpp +++ b/drape/overlay_handle.hpp @@ -19,6 +19,8 @@ namespace dp class OverlayHandle { public: + typedef vector<m2::RectF> Rects; + OverlayHandle(FeatureID const & id, dp::Anchor anchor, double priority); @@ -33,9 +35,9 @@ public: virtual void Update(ScreenBase const & /*screen*/) {} virtual m2::RectD GetPixelRect(ScreenBase const & screen) const = 0; - virtual vector<m2::RectF> & GetPixelShape(ScreenBase const & screen) = 0; + virtual void GetPixelShape(ScreenBase const & screen, Rects & rects) const = 0; - bool IsIntersect(ScreenBase const & screen, OverlayHandle & h); + bool IsIntersect(ScreenBase const & screen, OverlayHandle const & h) const; uint16_t * IndexStorage(uint16_t size); size_t GetIndexCount() const; @@ -88,12 +90,11 @@ public: double priority); virtual m2::RectD GetPixelRect(ScreenBase const & screen) const; - virtual vector<m2::RectF> & GetPixelShape(ScreenBase const & screen); + virtual void GetPixelShape(ScreenBase const & screen, Rects & rects) const; private: m2::PointD m_gbPivot; m2::PointD m_pxHalfSize; - vector<m2::RectF> m_bbox; }; } // namespace dp |