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

handle calls to barycenter for leaf nodes

This commit is contained in:
Sébastien Loriot 2024-01-30 17:59:33 +01:00
parent 3763febfa8
commit 85dd768676
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -452,6 +452,7 @@ public:
FT FT
compute_cartesian_coordinate(std::uint32_t gc, std::size_t depth, int ci) const compute_cartesian_coordinate(std::uint32_t gc, std::size_t depth, int ci) const
{ {
CGAL_assertion(depth <= m_side_per_depth.size());
// an odd coordinate will be first compute at the current depth, // an odd coordinate will be first compute at the current depth,
// while an even coordinate has already been computed at a previous depth. // while an even coordinate has already been computed at a previous depth.
// So while the coordinate is even, we decrease the depth to end up of the first // So while the coordinate is even, we decrease the depth to end up of the first
@ -460,7 +461,13 @@ public:
// due to rounding errors. // due to rounding errors.
if (gc == (1u << depth)) return (m_bbox.max)()[ci]; // gc == 2^node_depth if (gc == (1u << depth)) return (m_bbox.max)()[ci]; // gc == 2^node_depth
if (gc == 0) return (m_bbox.min)()[ci]; if (gc == 0) return (m_bbox.min)()[ci];
if (gc % 2 !=0) return (m_bbox.min)()[ci] + int(gc) * m_side_per_depth[depth][ci]; if (gc % 2 !=0)
{
FT size = depth < m_side_per_depth.size()
? m_side_per_depth[depth][ci]
: m_side_per_depth[depth-1][ci]/FT(2);
return (m_bbox.min)()[ci] + int(gc) * size;
}
std::size_t nd = depth; std::size_t nd = depth;
do{ do{
--nd; --nd;