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

Merge pull request #6022 from sloriot/PMP-deps 

Reduce dependencies
This commit is contained in:
Laurent Rineau 2021-09-30 16:49:34 +02:00
parent fc46cba057 2b666db30c
commit 01017f9deb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h
View File

@ -13,7 +13,7 @@
#ifndef CGAL_POLYGON_MESH_PROCESSING_GET_BORDER_H
#define CGAL_POLYGON_MESH_PROCESSING_GET_BORDER_H
#include <CGAL/license/Polygon_mesh_processing/miscellaneous.h>
#include <CGAL/license/Polygon_mesh_processing/core.h>
#include <CGAL/algorithm.h>
#include <CGAL/boost/graph/iterator.h>

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

@ -18,7 +18,7 @@
#include <CGAL/Polygon_mesh_processing/compute_normal.h>
#include <CGAL/Polygon_mesh_processing/border.h>
#include <CGAL/Polygon_mesh_processing/repair.h>
#include <CGAL/Polygon_mesh_processing/repair_degeneracies.h>
#include <CGAL/Polygon_mesh_processing/measure.h>
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/Polygon_mesh_processing/shape_predicates.h>
@ -1492,6 +1492,8 @@ private:
|| GeomTraits().collinear_3_object()(t, p, q))
continue;
typename GeomTraits::Construct_cross_product_vector_3 cross_product
= GeomTraits().construct_cross_product_vector_3_object();
#ifdef CGAL_PMP_REMESHING_DEBUG
typename GeomTraits::Construct_normal_3 normal
= GeomTraits().construct_normal_3_object();
@ -1499,13 +1501,13 @@ private:
Vector_3 normal_after_collapse = normal(t, p, q);
CGAL::Sign s1 = CGAL::sign(normal_before_collapse * normal_after_collapse);
CGAL::Sign s2 = CGAL::sign(CGAL::cross_product(Vector_3(s, p), Vector_3(s, q))
* CGAL::cross_product(Vector_3(t, p), Vector_3(t, q)));
CGAL::Sign s2 = CGAL::sign(cross_product(Vector_3(s, p), Vector_3(s, q))
* cross_product(Vector_3(t, p), Vector_3(t, q)));
CGAL_assertion(s1 == s2);
#endif
if(CGAL::sign(CGAL::cross_product(Vector_3(s, p), Vector_3(s, q))
* CGAL::cross_product(Vector_3(t, p), Vector_3(t, q)))
if(CGAL::sign(cross_product(Vector_3(s, p), Vector_3(s, q))
* cross_product(Vector_3(t, p), Vector_3(t, q)))
!= CGAL::POSITIVE)
return true;
}