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

Merge remote-tracking branch 'cgal/5.6.x-branch' into cgal/6.0.x-branch

This commit is contained in:
Sébastien Loriot 2025-04-16 18:51:44 +02:00
parent fc98272ec7 820d4decda
commit 6a56496c84
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kernel_23/doc/Kernel_23/CGAL/Segment_3.h
View File

@ -99,7 +99,7 @@ returns the squared length of `s`.
Kernel::FT squared_length() const; Kernel::FT squared_length() const;
/*! /*!
returns the vector `s.target()` - `s`.`source()`. returns the vector `s.target()` - `s.source()`.
*/ */
Vector_3<Kernel> to_vector() const; Vector_3<Kernel> to_vector() const;

10
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh_planar_patches.h
View File

@ -32,6 +32,10 @@
#include <boost/iterator/function_output_iterator.hpp> #include <boost/iterator/function_output_iterator.hpp>
#include <boost/container/small_vector.hpp> #include <boost/container/small_vector.hpp>
#ifdef CGAL_DEBUG_DECIMATION
#include <CGAL/IO/polygon_soup_io.h>
#endif
#include <algorithm> #include <algorithm>
#include <unordered_map> #include <unordered_map>
@ -243,7 +247,7 @@ bool is_edge_between_coplanar_faces(edge_descriptor e,
Point_ref_3 s = get(vpm, target(next(opposite(h, tm), tm), tm) ); Point_ref_3 s = get(vpm, target(next(opposite(h, tm), tm), tm) );
if (coplanar_cos_threshold==-1) if (coplanar_cos_threshold==-1)
return coplanar(p, q, r, s); return coplanar(p, q, r, s) && coplanar_orientation(p, q, r, s)!=CGAL::POSITIVE;
else else
{ {
typename Kernel::Compare_dihedral_angle_3 pred; typename Kernel::Compare_dihedral_angle_3 pred;
@ -848,6 +852,10 @@ bool decimate_impl(const TriangleMeshIn& tm_in,
if (!is_polygon_soup_a_polygon_mesh(faces)) if (!is_polygon_soup_a_polygon_mesh(faces))
{ {
#ifdef CGAL_DEBUG_DECIMATION
CGAL::IO::write_polygon_soup("soup.off", corners, faces);
std::cout << "the output is not a valid polygon mesh!" << std::endl;
#endif
return false; return false;
} }