boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-01 20:42:10 +00:00
Code Issues Projects Releases Wiki Activity

[buffer][performance] add boolean to indicate concave rings:

Browse Source 
in non concave rings, no turn calculation is necessary
This commit is contained in:
Barend Gehrels
2014-11-09 17:00:56 +01:00
parent 95583233e7
commit a62e2d2e84
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
View File

@@ -161,6 +161,7 @@ struct buffer_range
std::vector<output_point_type> range_out;
end_strategy.apply(penultimate_input, prev_perp2, previous_input, perp1, side, distance, range_out);
collection.add_endcap(end_strategy, range_out, previous_input);
collection.set_current_ring_concave();
}
return;
case strategy::buffer::join_convex :

16
include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
View File

@@ -636,12 +636,15 @@ struct buffered_piece_collection
}
}
inline void set_current_ring_concave()
{
BOOST_ASSERT(boost::size(offsetted_rings) > 0);
offsetted_rings.back().has_concave = true;
}
inline int add_point(point_type const& p)
{
BOOST_ASSERT
(
boost::size(offsetted_rings) > 0
);
BOOST_ASSERT(boost::size(offsetted_rings) > 0);
current_segment_id.segment_index++;
offsetted_rings.back().push_back(p);
@@ -652,6 +655,11 @@ struct buffered_piece_collection
inline piece& create_piece(strategy::buffer::piece_type type, bool decrease_segment_index_by_one)
{
if (type == strategy::buffer::buffered_concave)
{
offsetted_rings.back().has_concave = true;
}
piece pc;
pc.type = type;
pc.index = boost::size(m_pieces);

4
include/boost/geometry/algorithms/detail/buffer/buffered_ring.hpp
View File

@@ -43,11 +43,13 @@ struct buffered_ring_collection_tag : polygonal_tag, multi_tag
template <typename Ring>
struct buffered_ring : public Ring
{
bool has_concave;
bool has_accepted_intersections;
bool has_discarded_intersections;
inline buffered_ring()
: has_accepted_intersections(false)
: has_concave(false)
, has_accepted_intersections(false)
, has_discarded_intersections(false)
{}

13
include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp
View File

@@ -69,6 +69,17 @@ class piece_turn_visitor
|| piece1.index == piece2.right_index;
}
template <typename Piece>
inline bool is_on_same_convex_ring(Piece const& piece1, Piece const& piece2) const
{
if (piece1.first_seg_id.multi_index != piece2.first_seg_id.multi_index)
{
return false;
}
return ! m_rings[piece1.first_seg_id.multi_index].has_concave;
}
template <typename Range, typename Iterator>
inline void move_to_next_point(Range const& range, Iterator& next) const
{
@@ -172,11 +183,13 @@ public:
{
boost::ignore_unused_variable_warning(first);
if ( is_adjacent(piece1, piece2)
|| is_on_same_convex_ring(piece1, piece2)
|| detail::disjoint::disjoint_box_box(piece1.robust_envelope,
piece2.robust_envelope))
{
return;
}
calculate_turns(piece1, piece2);
}
};