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))) diff --git a/drape_frontend/gps_track_shape.cpp b/drape_frontend/gps_track_shape.cpp index dff3bd9442..ffd0924de2 100644 --- a/drape_frontend/gps_track_shape.cpp +++ b/drape_frontend/gps_track_shape.cpp @@ -105,7 +105,7 @@ m2::RectD GpsTrackHandle::GetPixelRect(ScreenBase const & screen, bool perspecti return m2::RectD(); } -void GpsTrackHandle::GetPixelShape(ScreenBase const & screen, Rects & rects, bool perspective) const +void GpsTrackHandle::GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const { UNUSED_VALUE(screen); UNUSED_VALUE(perspective); diff --git a/drape_frontend/gps_track_shape.hpp b/drape_frontend/gps_track_shape.hpp index 21c67f3798..41f5a097d7 100644 --- a/drape_frontend/gps_track_shape.hpp +++ b/drape_frontend/gps_track_shape.hpp @@ -52,7 +52,7 @@ public: void GetAttributeMutation(ref_ptr mutator) const override; bool Update(ScreenBase const & screen) override; 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; bool IndexesRequired() const override; void Clear(); diff --git a/drape_frontend/gui/shape.cpp b/drape_frontend/gui/shape.cpp index a385905494..794405dc26 100644 --- a/drape_frontend/gui/shape.cpp +++ b/drape_frontend/gui/shape.cpp @@ -45,7 +45,7 @@ m2::RectD Handle::GetPixelRect(const ScreenBase & screen, bool perspective) cons return m2::RectD(); } -void Handle::GetPixelShape(const ScreenBase & screen, dp::OverlayHandle::Rects & rects, bool perspective) const +void Handle::GetPixelShape(const ScreenBase & screen, bool perspective, dp::OverlayHandle::Rects & rects) const { // There is no need to check intersection of gui elements. UNUSED_VALUE(screen); diff --git a/drape_frontend/gui/shape.hpp b/drape_frontend/gui/shape.hpp index 2b32f0ede7..700be42ae3 100644 --- a/drape_frontend/gui/shape.hpp +++ b/drape_frontend/gui/shape.hpp @@ -29,7 +29,7 @@ public: virtual bool IndexesRequired() const override; virtual m2::RectD GetPixelRect(ScreenBase const & screen, bool perspective) const override; - virtual void GetPixelShape(ScreenBase const & screen, Rects & rects, bool perspective) const override; + virtual void GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const override; m2::PointF GetSize() const { return m_size; } virtual void SetPivot(glsl::vec2 const & pivot) { m_pivot = pivot; } diff --git a/drape_frontend/path_text_shape.cpp b/drape_frontend/path_text_shape.cpp index 83714d9f1f..601a796b63 100644 --- a/drape_frontend/path_text_shape.cpp +++ b/drape_frontend/path_text_shape.cpp @@ -130,7 +130,7 @@ public: return result; } - void GetPixelShape(ScreenBase const & screen, Rects & rects, bool perspective) const override + void GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const override { m2::PointD const pixelPivot(screen.GtoP(m_globalPivot)); for (size_t quadIndex = 0; quadIndex < m_buffer.size(); quadIndex += 4) diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp index 38b1da9512..ca72b4337f 100644 --- a/drape_frontend/text_shape.cpp +++ b/drape_frontend/text_shape.cpp @@ -94,7 +94,7 @@ public: max(x, pivot.x), max(y, pivot.y)); } - void GetPixelShape(ScreenBase const & screen, Rects & rects, bool perspective) const override + void GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const override { rects.emplace_back(GetPixelRect(screen, perspective)); } diff --git a/drape_frontend/tile_key.hpp b/drape_frontend/tile_key.hpp index d4245ca600..d277abbe22 100755 --- a/drape_frontend/tile_key.hpp +++ b/drape_frontend/tile_key.hpp @@ -17,7 +17,7 @@ struct TileKey bool operator < (TileKey const & other) const; bool operator == (TileKey const & other) const; - // This methods implement strict comparison of tile keys. It's necessary to merger of + // These methods implement strict comparison of tile keys. It's necessary to merger of // batches which must not merge batches with different m_generation. bool LessStrict(TileKey const & other) const; bool EqualStrict(TileKey const & other) const; diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp index d2fa9491c3..e01769c0ed 100644 --- a/drape_head/testing_engine.cpp +++ b/drape_head/testing_engine.cpp @@ -660,7 +660,7 @@ void TestingEngine::OnFlushData(dp::GLState const & state, drape_ptrGetPixelRect(m_modelView, false)); m_rects.resize(m_rects.size() + 1); - handle->GetPixelShape(m_modelView, m_rects.back(), false); + handle->GetPixelShape(m_modelView, false, m_rects.back()); } }; }