Skip to content

Commit

Permalink
Eliminate use of constr_pt()
Browse files Browse the repository at this point in the history
  • Loading branch information
JacksonCampolattaro committed Jul 29, 2020
1 parent 52a2b14 commit f6dffe4
Showing 1 changed file with 11 additions and 11 deletions.
Expand Up @@ -347,7 +347,7 @@ class Octree : public PointAccessor {
cell->child[7] = new Cell(cell->first,
zLowYLowXSplit,
transl(cell->center, constr_vec(
ORIGIN, constr_pt(-width, -width, -width))),
ORIGIN, Point_3(-width, -width, -width))),
cell->level + 1);

if (cell->child[7]->size() > m_bucket_size)
Expand All @@ -360,7 +360,7 @@ class Octree : public PointAccessor {
cell->child[6] = new Cell(zLowYLowXSplit + 1,
zLowYSplit,
transl(cell->center, constr_vec(
ORIGIN, constr_pt(width, -width, -width))),
ORIGIN, Point_3(width, -width, -width))),
cell->level + 1);

if (cell->child[6]->size() > m_bucket_size)
Expand All @@ -375,7 +375,7 @@ class Octree : public PointAccessor {
cell->child[5] = new Cell(zLowYSplit + 1,
zLowYHighXSplit,
transl(cell->center, constr_vec(
ORIGIN, constr_pt(-width, width, -width))),
ORIGIN, Point_3(-width, width, -width))),
cell->level + 1);

if (cell->child[5]->size() > m_bucket_size)
Expand All @@ -388,7 +388,7 @@ class Octree : public PointAccessor {
cell->child[4] = new Cell(zLowYHighXSplit + 1,
zSplit,
transl(cell->center, constr_vec(
ORIGIN, constr_pt(width, width, -width))),
ORIGIN, Point_3(width, width, -width))),
cell->level + 1);

if (cell->child[4]->size() > m_bucket_size)
Expand All @@ -404,7 +404,7 @@ class Octree : public PointAccessor {
cell->child[3] = new Cell(zSplit + 1,
zHighYLowXSplit,
transl(cell->center, constr_vec(
ORIGIN, constr_pt(-width, -width, width))),
ORIGIN, Point_3(-width, -width, width))),
cell->level + 1);

if (cell->child[3]->size() > m_bucket_size)
Expand All @@ -417,7 +417,7 @@ class Octree : public PointAccessor {
cell->child[2] = new Cell(zHighYLowXSplit + 1,
zHighYSplit,
transl(cell->center, constr_vec(
ORIGIN, constr_pt(width, -width, width))),
ORIGIN, Point_3(width, -width, width))),
cell->level + 1);

if (cell->child[2]->size() > m_bucket_size)
Expand All @@ -432,7 +432,7 @@ class Octree : public PointAccessor {
cell->child[1] = new Cell(zHighYSplit + 1,
zHighYHighXSplit,
transl(cell->center, constr_vec(
ORIGIN, constr_pt(-width, width, width))),
ORIGIN, Point_3(-width, width, width))),
cell->level + 1);

if (cell->child[1]->size() > m_bucket_size)
Expand All @@ -446,7 +446,7 @@ class Octree : public PointAccessor {
cell->child[0] = new Cell(zHighYHighXSplit + 1,
cell->last,
transl(cell->center, constr_vec(
ORIGIN, constr_pt(width, width, width))),
ORIGIN, Point_3(width, width, width))),
cell->level + 1);

if (cell->child[0]->size() > m_bucket_size)
Expand Down Expand Up @@ -600,9 +600,9 @@ class Octree : public PointAccessor {

m_width = (std::max)(max[0] - min[0],
(std::max)(max[1] - min[1], max[2] - min[2])) * (FT) 0.5;
m_center = constr_pt((min[0] + max[0]) * (FT) 0.5,
(min[1] + max[1]) * (FT) 0.5,
(min[2] + max[2]) * (FT) 0.5);
m_center = Point_3((min[0] + max[0]) * (FT) 0.5,
(min[1] + max[1]) * (FT) 0.5,
(min[2] + max[2]) * (FT) 0.5);

return m_bBox;
}
Expand Down

0 comments on commit f6dffe4

Please sign in to comment.