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

fix the own_tree logic, that is not valid anymore 

the question is to know whether the vector<AABB_tree*> is built
or not
This commit is contained in:
Jane Tournois 2017-07-05 16:03:06 +02:00 committed by Andreas Fabri
parent 2107b95a04
commit 860cf84b9f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
View File

@ -295,10 +295,10 @@ namespace internal {
, VertexIsConstrainedMap vcmap
, FacePatchMap fpmap
, FaceIndexMap fimap
, const bool own_tree = true)//built by the remesher
, const bool build_tree = true)//built by the remesher
: mesh_(pmesh)
, vpmap_(vpmap)
, own_tree_(own_tree)
, build_tree_(build_tree)
, has_border_(false)
, input_triangles_()
, input_patch_ids_()
@ -322,7 +322,7 @@ namespace internal {
remove(halfedge_status_pmap_, mesh_);
if (own_tree_){
if (build_tree_){
for(int i=0; i < trees.size();++i){
delete trees[i];
}
@ -358,6 +358,8 @@ namespace internal {
}
CGAL_assertion(input_triangles_.size() == input_patch_ids_.size());
if (!build_tree_)
return;
trees.resize(patch_id_to_index_map.size());
for(int i=0; i < trees.size(); ++i){
trees[i] = new AABB_tree();
@ -1903,7 +1905,7 @@ private:
private:
PolygonMesh& mesh_;
VertexPointMap& vpmap_;
bool own_tree_;
bool build_tree_;
bool has_border_;
std::vector<AABB_tree*> trees;
Patch_id_to_index_map patch_id_to_index_map;