songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Recursive intersection now uses indices

This commit is contained in:
JacksonCampolattaro 2023-04-24 13:38:05 +02:00
parent c0a8bbf2c9
commit b267403b95
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Orthtree/include/CGAL/Orthtree.h
View File

@ -642,7 +642,7 @@ public:
*/ */
template <typename Query, typename OutputIterator> template <typename Query, typename OutputIterator>
OutputIterator intersected_nodes(const Query& query, OutputIterator output) const { OutputIterator intersected_nodes(const Query& query, OutputIterator output) const {
return intersected_nodes_recursive(query, root(), output); return intersected_nodes_recursive(query, index(root()), output);
} }
/// @} /// @}
@ -1167,21 +1167,22 @@ private: // functions :
} }
template <typename Query, typename Node_output_iterator> template <typename Query, typename Node_output_iterator>
Node_output_iterator intersected_nodes_recursive(const Query& query, const Node& node, Node_output_iterator intersected_nodes_recursive(const Query& query, Node_index node,
Node_output_iterator output) const { Node_output_iterator output) const {
// Check if the current node intersects with the query // Check if the current node intersects with the query
if (CGAL::do_intersect(query, bbox(node))) { if (CGAL::do_intersect(query, bbox(node))) {
// if this node is a leaf, then it's considered an intersecting node // if this node is a leaf, then it's considered an intersecting node
if (node.is_leaf()) { if (is_leaf(node)) {
*output++ = &node; // todo: output iterator should hold indices instead of pointers
*output++ = &m_nodes[node];
return output; return output;
} }
// Otherwise, each of the children need to be checked // Otherwise, each of the children need to be checked
for (int i = 0; i < Degree::value; ++i) { for (int i = 0; i < Degree::value; ++i) {
intersected_nodes_recursive(query, children(node)[i], output); intersected_nodes_recursive(query, index(children(node)[i]), output);
} }
} }
return output; return output;