juli/OrcaSlicer
1
1 Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-22 14:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade CGAL from 5.6.3 to 6.2.1 (#16258)

Browse Source 
Co-authored-by: Andrei <1331777+andreili@users.noreply.github.com>
Co-authored-by: Amelia <26681721+elihwyma@users.noreply.github.com>
Co-authored-by: Kris Austin <kris.austin@gmail.com>
This commit is contained in:
Ian BassiAndreiAmeliaKris Austin
 authored and GitHub committed 2026-10-07 20:24:22 -03:00
1 parent 33f886406e
commit e729dbf142
23 files changed
+98 -97
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/libslic3r/TextureToColor/ColorUtils.cpp
+2 -2
View File
@@ -26,7 +26,7 @@
#include <boost/next_prior.hpp>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_tree.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Point_3.h>
@@ -98,7 +98,7 @@ typedef boost::graph_traits<CGALMesh>::halfedge_descriptor halfedge_descriptor;
typedef boost::graph_traits<CGALMesh>::edge_descriptor edge_descriptor;
typedef boost::graph_traits<CGALMesh>::vertex_descriptor vertex_descriptor;
typedef CGAL::AABB_face_graph_triangle_primitive<CGALMesh> Primitive;
typedef CGAL::AABB_traits<CGALKernel, Primitive> Traits;
typedef CGAL::AABB_traits_3<CGALKernel, Primitive> Traits;
typedef CGAL::AABB_tree<Traits> Tree;
typedef CGALMesh::template Property_map<vertex_descriptor, CGALKernel::Vector_3> VNMap;
src/libslic3r/TextureToColor/Repair.hpp
+5 -4
View File
@@ -2,7 +2,8 @@
#include "TriMesh.hpp"
#include "CgalUtils.hpp"
#include "Callbacks.hpp"
#include <CGAL/Polygon_mesh_processing/border.h>
#include <CGAL/boost/graph/border.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/manifoldness.h>
#include <CGAL/Polygon_mesh_processing/repair_degeneracies.h>
#include <CGAL/Polygon_mesh_processing/repair_polygon_soup.h>
@@ -64,7 +65,7 @@ inline BoundaryEdgeStats ComputeBoundaryEdgeStats(const cgalutils::CGALMesh& cga
using HalfedgeDescriptor = boost::graph_traits<CGALMesh>::halfedge_descriptor;
std::vector<HalfedgeDescriptor> border_cycles;
PMP::extract_boundary_cycles(cgal_mesh, std::back_inserter(border_cycles));
CGAL::extract_boundary_cycles(cgal_mesh, std::back_inserter(border_cycles));
BoundaryEdgeStats stats;
stats.cycle_count = border_cycles.size();
@@ -94,11 +95,11 @@ inline void CloseBoundariesAndRepairManifoldness(cgalutils::CGALMesh& cgal_mesh)
PMP::duplicate_non_manifold_vertices(cgal_mesh);
std::vector<HalfedgeDescriptor> border_cycles;
PMP::extract_boundary_cycles(cgal_mesh, std::back_inserter(border_cycles));
CGAL::extract_boundary_cycles(cgal_mesh, std::back_inserter(border_cycles));
for (const HalfedgeDescriptor h : border_cycles) {
std::vector<FaceDescriptor> patch_faces;
PMP::triangulate_hole(cgal_mesh, h, std::back_inserter(patch_faces));
PMP::triangulate_hole(cgal_mesh, h, CGAL::parameters::face_output_iterator(std::back_inserter(patch_faces)));
}
PMP::remove_degenerate_faces(cgal_mesh);