diff options
Diffstat (limited to 'src/mbgl/util/grid_index.hpp')
-rw-r--r-- | src/mbgl/util/grid_index.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mbgl/util/grid_index.hpp b/src/mbgl/util/grid_index.hpp index cb38023e59..502b1d99a0 100644 --- a/src/mbgl/util/grid_index.hpp +++ b/src/mbgl/util/grid_index.hpp @@ -56,8 +56,7 @@ constexpr bool operator!=(circle<T> const& lhs, circle<T> const& rhs) template <class T> class GridIndex { public: - - GridIndex(const float width_, const float height_, const uint32_t cellSize_); + GridIndex(float width_, float height_, uint32_t cellSize_); using BBox = mapbox::geometry::box<float>; using BCircle = geometry::circle<float>; @@ -81,9 +80,9 @@ private: void query(const BBox&, std::function<bool (const T&, const BBox&)>) const; void query(const BCircle&, std::function<bool (const T&, const BBox&)>) const; - std::size_t convertToXCellCoord(const float x) const; - std::size_t convertToYCellCoord(const float y) const; - + std::size_t convertToXCellCoord(float x) const; + std::size_t convertToYCellCoord(float y) const; + bool boxesCollide(const BBox&, const BBox&) const; bool circlesCollide(const BCircle&, const BCircle&) const; bool circleAndBoxCollide(const BCircle&, const BBox&) const; |