Upgrade CGAL from 5.6.3 to 6.2.1 (#16258)

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>

deps/CGAL/CGAL.cmake

@@ -5,10 +5,10 @@ endif ()
 orcaslicer_add_cmake_project(
     CGAL
     # GIT_REPOSITORY https://github.com/CGAL/cgal.git
-    # GIT_TAG        3654f780ae0c64675cabaef0e5ddaf904c48b4b7 # releases/CGAL-5.6.3
+    # GIT_TAG        28811b671a12b5caa9e3688569dadbc6b3728fe6 # v6.2.1
     # For whatever reason, this keeps downloading forever (repeats downloads if finished)
-    URL      https://github.com/CGAL/cgal/releases/download/v5.6.3/CGAL-5.6.3.zip
+    URL      https://github.com/CGAL/cgal/releases/download/v6.2.1/CGAL-6.2.1.zip
-    URL_HASH SHA256=5d577acb4a9918ccb960491482da7a3838f8d363aff47e14d703f19fd84733d4
+    URL_HASH SHA256=eebd737d9b7f0199647ba5c1f9f6c7a3d0651aacef9c2fd4dedc52da6c25edbe
     DEPENDS dep_Boost dep_Eigen dep_GMP dep_MPFR
 )
 

deps_src/libigl/igl/copyleft/cgal/CGAL_includes.hpp

@@ -33,8 +33,8 @@
 
 // Axis-aligned bounding box tree for tet tri intersection
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive.h>
+#include <CGAL/AABB_triangle_primitive_3.h>
 
 // Boolean operations
 #include <CGAL/Polyhedron_3.h>

deps_src/libigl/igl/copyleft/cgal/closest_facet.cpp

@@ -41,9 +41,9 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
     const std::vector<std::vector<size_t> > & VF,
     const std::vector<std::vector<size_t> > & VFi,
     const CGAL::AABB_tree<
-      CGAL::AABB_traits<
+      CGAL::AABB_traits_3<
         Kernel, 
-        CGAL::AABB_triangle_primitive<
+        CGAL::AABB_triangle_primitive_3<
           Kernel, typename std::vector<
             typename Kernel::Triangle_3 >::iterator > > > & tree,
     const std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -56,8 +56,8 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
   typedef typename Kernel::Segment_3 Segment_3;
   typedef typename Kernel::Triangle_3 Triangle;
   typedef typename std::vector<Triangle>::iterator Iterator;
-  typedef typename CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
+  typedef typename CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
-  typedef typename CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
+  typedef typename CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
   typedef typename CGAL::AABB_tree<AABB_triangle_traits> Tree;
 
   if (F.rows() <= 0 || I.rows() <= 0) {
@@ -451,8 +451,8 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
   typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel;
   typedef Kernel::Triangle_3 Triangle;
   typedef std::vector<Triangle>::iterator Iterator;
-  typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
+  typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
-  typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
+  typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
   typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
 
   if (F.rows() <= 0 || I.rows() <= 0) {
@@ -498,9 +498,9 @@ IGL_INLINE void igl::copyleft::cgal::closest_facet(
 #ifdef IGL_STATIC_LIBRARY
 // Explicit template instantiation
 // generated by autoexplicit.sh
-template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
+template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 1, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
 // generated by autoexplicit.sh
-template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
+template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, std::vector<std::vector<size_t, std::allocator<size_t>>, std::allocator<std::vector<size_t, std::allocator<size_t>>>> const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>>::iterator, CGAL::Boolean_tag<false>>, CGAL::Default>> const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3>> const&, std::vector<bool, std::allocator<bool>> const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&);
 // generated by autoexplicit.sh
 template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(
     Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, 
@@ -509,7 +509,7 @@ template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT,
     Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, 
     Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, 
     Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, 
-    Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
+    Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
 #include <cstdint>
 template void igl::copyleft::cgal::closest_facet<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(
 Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&, 
@@ -518,7 +518,7 @@ Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&,
 Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&, 
 Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, 
 Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, 
-Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&, 
+Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, std::vector<std::vector<size_t, std::allocator<size_t> >, std::allocator<std::vector<size_t, std::allocator<size_t> > > > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> > const&, std::vector<bool, std::allocator<bool> > const&, 
 Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, 
 Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
 

deps_src/libigl/igl/copyleft/cgal/closest_facet.h

@@ -14,8 +14,8 @@
 #include <vector>
 
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive.h>
+#include <CGAL/AABB_triangle_primitive_3.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
@@ -67,9 +67,9 @@ namespace igl
           const std::vector<std::vector<size_t> > & VF,
           const std::vector<std::vector<size_t> > & VFi,
           const CGAL::AABB_tree<
-            CGAL::AABB_traits<
+            CGAL::AABB_traits_3<
               Kernel, 
-              CGAL::AABB_triangle_primitive<
+              CGAL::AABB_triangle_primitive_3<
                 Kernel, typename std::vector<
                   typename Kernel::Triangle_3 >::iterator > > > & tree,
           const std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -139,9 +139,9 @@ namespace igl
           const std::vector<std::vector<size_t> > & VF,
           const std::vector<std::vector<size_t> > & VFi,
           const CGAL::AABB_tree<
-            CGAL::AABB_traits<
+            CGAL::AABB_traits_3<
               Kernel, 
-              CGAL::AABB_triangle_primitive<
+              CGAL::AABB_triangle_primitive_3<
                 Kernel, typename std::vector<
                   typename Kernel::Triangle_3 >::iterator > > > & tree,
           const std::vector<typename Kernel::Triangle_3 > & triangles,

deps_src/libigl/igl/copyleft/cgal/component_inside_component.cpp

@@ -12,8 +12,8 @@
 #include "points_inside_component.h"
 
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive.h>
+#include <CGAL/AABB_triangle_primitive_3.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <cassert>

deps_src/libigl/igl/copyleft/cgal/extract_cells.cpp

@@ -23,8 +23,8 @@
 #include "../../vertex_triangle_adjacency.h"
 
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive.h>
+#include <CGAL/AABB_triangle_primitive_3.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
@@ -156,9 +156,9 @@ IGL_INLINE size_t igl::copyleft::cgal::extract_cells(
   std::vector<VectorXI> Is(num_components);
   std::vector<
     CGAL::AABB_tree<
-      CGAL::AABB_traits<
+      CGAL::AABB_traits_3<
         Kernel,
-        CGAL::AABB_triangle_primitive<
+        CGAL::AABB_triangle_primitive_3<
           Kernel, std::vector<
             Kernel::Triangle_3 >::iterator > > > > trees(num_components);
   std::vector< std::vector<Kernel::Triangle_3 > >

deps_src/libigl/igl/copyleft/cgal/hausdorff.cpp

@@ -9,8 +9,8 @@ template <
 IGL_INLINE void igl::copyleft::cgal::hausdorff(
   const Eigen::MatrixBase<DerivedV>& V,
   const CGAL::AABB_tree<
-    CGAL::AABB_traits<Kernel, 
+    CGAL::AABB_traits_3<Kernel, 
-      CGAL::AABB_triangle_primitive<Kernel, 
+      CGAL::AABB_triangle_primitive_3<Kernel, 
         typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
       >
     >
@@ -27,8 +27,8 @@ IGL_INLINE void igl::copyleft::cgal::hausdorff(
   {
     CGAL::Point_3<Kernel> query(x,y,z);
     typename CGAL::AABB_tree<
-      CGAL::AABB_traits<Kernel, 
+      CGAL::AABB_traits_3<Kernel, 
-        CGAL::AABB_triangle_primitive<Kernel, 
+        CGAL::AABB_triangle_primitive_3<Kernel, 
           typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
         >
       >
@@ -41,5 +41,5 @@ IGL_INLINE void igl::copyleft::cgal::hausdorff(
 #ifdef IGL_STATIC_LIBRARY
 // Explicit template instantiation
 // generated by autoexplicit.sh
-template void igl::copyleft::cgal::hausdorff<Eigen::Matrix<double, -1, -1, 0, -1, -1>, CGAL::Simple_cartesian<double>, double>(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, double&, double&);
+template void igl::copyleft::cgal::hausdorff<Eigen::Matrix<double, -1, -1, 0, -1, -1>, CGAL::Simple_cartesian<double>, double>(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, double&, double&);
 #endif

deps_src/libigl/igl/copyleft/cgal/hausdorff.h

@@ -38,8 +38,8 @@ namespace igl
       IGL_INLINE void hausdorff(
         const Eigen::MatrixBase<DerivedV>& V,
         const CGAL::AABB_tree<
-          CGAL::AABB_traits<Kernel, 
+          CGAL::AABB_traits_3<Kernel, 
-            CGAL::AABB_triangle_primitive<Kernel, 
+            CGAL::AABB_triangle_primitive_3<Kernel, 
               typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
             >
           >

deps_src/libigl/igl/copyleft/cgal/outer_hull.cpp

@@ -12,8 +12,8 @@
 #include "../../remove_unreferenced.h"
 
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive.h>
+#include <CGAL/AABB_triangle_primitive_3.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 

deps_src/libigl/igl/copyleft/cgal/outer_hull_legacy.cpp

@@ -12,8 +12,8 @@
 #include "../../remove_unreferenced.h"
 
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive.h>
+#include <CGAL/AABB_triangle_primitive_3.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 

deps_src/libigl/igl/copyleft/cgal/point_mesh_squared_distance.cpp

@@ -29,8 +29,8 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
   using namespace std;
   typedef CGAL::Triangle_3<Kernel> Triangle_3; 
   typedef typename std::vector<Triangle_3>::iterator Iterator;
-  typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
+  typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
-  typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
+  typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
   typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
   Tree tree;
   vector<Triangle_3> T;
@@ -43,8 +43,8 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance_precompute(
   const Eigen::MatrixBase<DerivedV> & V,
   const Eigen::MatrixBase<DerivedF> & F,
   CGAL::AABB_tree<
-    CGAL::AABB_traits<Kernel, 
+    CGAL::AABB_traits_3<Kernel, 
-      CGAL::AABB_triangle_primitive<Kernel, 
+      CGAL::AABB_triangle_primitive_3<Kernel, 
         typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
       >
     >
@@ -90,8 +90,8 @@ template <
 IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
   const Eigen::MatrixBase<DerivedP> & P,
   const CGAL::AABB_tree<
-    CGAL::AABB_traits<Kernel, 
+    CGAL::AABB_traits_3<Kernel, 
-      CGAL::AABB_triangle_primitive<Kernel, 
+      CGAL::AABB_triangle_primitive_3<Kernel, 
         typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
       >
     >
@@ -103,8 +103,8 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
 {
   typedef CGAL::Triangle_3<Kernel> Triangle_3; 
   typedef typename std::vector<Triangle_3>::iterator Iterator;
-  typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
+  typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
-  typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
+  typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
   typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
   typedef typename Tree::Point_and_primitive_id Point_and_primitive_id;
   typedef CGAL::Point_3<Kernel>    Point_3;
@@ -134,7 +134,7 @@ IGL_INLINE void igl::copyleft::cgal::point_mesh_squared_distance(
 template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Epeck, Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 1, 0, -1, 1>>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>> const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1>> const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>> const&, Eigen::PlainObjectBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1>>&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1>>&);
 template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Epeck,   Eigen::Matrix<CGAL::Epeck::FT, -1, 3, 0, -1, 3>,   Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1,   -1>, Eigen::Matrix<CGAL::Epeck::FT, -1, 1, 0, -1, 1>,   Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>   >(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 3,   0, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0,   -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1>   > const&,   Eigen::PlainObjectBase<Eigen::Matrix<CGAL::Epeck::FT, -1, 1,   0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&,   Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&);
 template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Epeck, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&);
-template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 3, 1, -1, 3> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> >&);
+template void igl::copyleft::cgal::point_mesh_squared_distance<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 3, 1, -1, 3> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> > const&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> >&);
-template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
+template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
-template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
+template void igl::copyleft::cgal::point_mesh_squared_distance_precompute<CGAL::Simple_cartesian<double>, Eigen::Matrix<double, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Simple_cartesian<double>, CGAL::AABB_triangle_primitive_3<CGAL::Simple_cartesian<double>, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >::iterator, CGAL::Boolean_tag<false> >, CGAL::Default> >&, std::vector<CGAL::Triangle_3<CGAL::Simple_cartesian<double> >, std::allocator<CGAL::Triangle_3<CGAL::Simple_cartesian<double> > > >&);
 #endif

deps_src/libigl/igl/copyleft/cgal/point_mesh_squared_distance.h

@@ -63,8 +63,8 @@ namespace igl
         const Eigen::MatrixBase<DerivedV> & V,
         const Eigen::MatrixBase<DerivedF> & F,
         CGAL::AABB_tree<
-          CGAL::AABB_traits<Kernel, 
+          CGAL::AABB_traits_3<Kernel, 
-            CGAL::AABB_triangle_primitive<Kernel, 
+            CGAL::AABB_triangle_primitive_3<Kernel, 
               typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
             >
           >
@@ -89,8 +89,8 @@ namespace igl
       IGL_INLINE void point_mesh_squared_distance(
         const Eigen::MatrixBase<DerivedP> & P,
         const CGAL::AABB_tree<
-          CGAL::AABB_traits<Kernel, 
+          CGAL::AABB_traits_3<Kernel, 
-            CGAL::AABB_triangle_primitive<Kernel, 
+            CGAL::AABB_triangle_primitive_3<Kernel, 
               typename std::vector<CGAL::Triangle_3<Kernel> >::iterator
             >
           >

deps_src/libigl/igl/copyleft/cgal/points_inside_component.cpp

@@ -13,8 +13,8 @@
 #include "assign_scalar.h"
 
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive.h>
+#include <CGAL/AABB_triangle_primitive_3.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <cassert>
@@ -35,8 +35,8 @@ namespace igl {
             typedef Kernel::Triangle_3 Triangle;
             typedef Kernel::Plane_3 Plane_3;
             typedef std::vector<Triangle>::iterator Iterator;
-            typedef CGAL::AABB_triangle_primitive<Kernel, Iterator> Primitive;
+            typedef CGAL::AABB_triangle_primitive_3<Kernel, Iterator> Primitive;
-            typedef CGAL::AABB_traits<Kernel, Primitive> AABB_triangle_traits;
+            typedef CGAL::AABB_traits_3<Kernel, Primitive> AABB_triangle_traits;
             typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
 
             template<typename DerivedF, typename DerivedI>

deps_src/libigl/igl/copyleft/cgal/signed_distance_isosurface.cpp

@@ -23,8 +23,8 @@
 #include <CGAL/IO/output_surface_facets_to_polyhedron.h>
 // Axis-aligned bounding box tree for tet tri intersection
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive.h>
+#include <CGAL/AABB_triangle_primitive_3.h>
 #include <vector>
 
 IGL_INLINE bool igl::copyleft::cgal::signed_distance_isosurface(

deps_src/libigl/igl/copyleft/cgal/submesh_aabb_tree.cpp

@@ -18,9 +18,9 @@ IGL_INLINE void igl::copyleft::cgal::submesh_aabb_tree(
   const Eigen::MatrixBase<DerivedF>& F,
   const Eigen::MatrixBase<DerivedI>& I,
   CGAL::AABB_tree<
-    CGAL::AABB_traits<
+    CGAL::AABB_traits_3<
       Kernel, 
-      CGAL::AABB_triangle_primitive<
+      CGAL::AABB_triangle_primitive_3<
         Kernel, typename std::vector<
           typename Kernel::Triangle_3 >::iterator > > > & tree,
   std::vector<typename Kernel::Triangle_3 > & triangles,
@@ -51,7 +51,7 @@ IGL_INLINE void igl::copyleft::cgal::submesh_aabb_tree(
 #ifdef IGL_STATIC_LIBRARY
 // Explicit template instantiation
 // generated by autoexplicit.sh
-template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
+template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
-template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
+template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
-template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits<CGAL::Epeck, CGAL::AABB_triangle_primitive<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
+template void igl::copyleft::cgal::submesh_aabb_tree<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1>, Eigen::Matrix<int, -1, 3, 1, -1, 3>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, CGAL::Epeck>(Eigen::MatrixBase<Eigen::Matrix<CGAL::Epeck::FT, -1, -1, 1, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 3, 1, -1, 3> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, CGAL::AABB_tree<CGAL::AABB_traits_3<CGAL::Epeck, CGAL::AABB_triangle_primitive_3<CGAL::Epeck, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >::iterator, CGAL::Boolean_tag<false> > > >&, std::vector<CGAL::Epeck::Triangle_3, std::allocator<CGAL::Epeck::Triangle_3> >&, std::vector<bool, std::allocator<bool> >&);
 #endif

deps_src/libigl/igl/copyleft/cgal/submesh_aabb_tree.h

@@ -14,8 +14,8 @@
 #include <vector>
 
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_traits_3.h>
-#include <CGAL/AABB_triangle_primitive.h>
+#include <CGAL/AABB_triangle_primitive_3.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
@@ -44,9 +44,9 @@ namespace igl
         const Eigen::MatrixBase<DerivedF>& F,
         const Eigen::MatrixBase<DerivedI>& I,
         CGAL::AABB_tree<
-          CGAL::AABB_traits<
+          CGAL::AABB_traits_3<
             Kernel, 
-            CGAL::AABB_triangle_primitive<
+            CGAL::AABB_triangle_primitive_3<
               Kernel, typename std::vector<
                 typename Kernel::Triangle_3 >::iterator > > > & tree,
         std::vector<typename Kernel::Triangle_3 > & triangles,

docs/HLSD/preset-cache.md

@@ -39,7 +39,7 @@ presets are never serialized — they have their own storage and their own lifec
 
 | Location | Contents on a shipped build | Role |
 |---|---|---|
-| `resources/profiles/` | `<vendor>.opc` alone — the profile and its preset JSONs both pruned | What the app ships with; what installing copies from, and the only thing it is read for |
+| `resources/profiles/` | `<vendor>.opc` alone — the profile and its preset JSONs both pruned | What the app ships with and what installing copies from; read directly for vendors not installed |
 | `<data_dir>/system/` | `<vendor>.opc` alone, or `<vendor>.json` + `<vendor>/` after an update | What the user has installed |
 | `<data_dir>/system/` (dev build) | `<vendor>.json` + `<vendor>/` + `<vendor>.opc` written at runtime | A developer tree caches as it parses |
 | `<data_dir>/cache/wizard_profile_data.json` | The wizard's derived vendor catalog plus the stamps it was built from | Written and read by the setup wizard only; never shipped (see "The wizard's profile-data cache") |
@@ -182,10 +182,11 @@ one startup.
 
 **A vendor is loaded from where it is installed and nowhere else.** For startup that
 is `<data_dir>/system/`; resources reaches the app by being *installed* into that
-directory first, never by being loaded from. (The setup wizard is the one caller with
+directory first, never by being loaded from. (The setup wizard and the Create Printer
-a different notion of "where": it also shows vendors the user has not installed, and
+dialog also offer vendors the user has not installed, and load those from
-loads those from `resources/profiles` — see "The wizard's profile-data cache".) There
+`resources/profiles`; see "The wizard's profile-data cache". The dialog's vendor-only and
-is one lookup tier and one parse source:
+filament-only scans read a cache only where it is the whole installation, and never write
+one.) There is one lookup tier and one parse source:
 
 ```
 load vendor V from <data_dir>/system:

localization/i18n/list.txt

@@ -295,8 +295,6 @@ src/slic3r/GUI/CAD/DesignSketchTool.cpp
 src/slic3r/GUI/CAD/SketchInlineEditor.cpp
 src/slic3r/GUI/CAD/DesignOffer.hpp
 src/slic3r/GUI/CAD/DesignTextDialog.cpp
-src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp
-src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp
 src/slic3r/GUI/KeyChord.cpp
 src/slic3r/GUI/Shortcuts.cpp
 src/libslic3r/CAD/CadDocument.cpp

resources/images/toolbar_modifier_cube_dark.svg

@@ -1,4 +0,0 @@
-<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M17.0007 3.15607L5.26748 9.97446C5.0759 10.0857 4.8723 10.2988 4.71546 10.5713C4.55862 10.8438 4.47656 11.127 4.47656 11.349V24.4715C4.47656 24.6929 4.55879 24.9752 4.71606 25.2472C4.87328 25.5192 5.07737 25.7322 5.26956 25.8438L17.1143 32.6992C17.3061 32.8102 17.5904 32.8795 17.902 32.8782C18.2136 32.8768 18.4968 32.8049 18.6868 32.6927L30.2729 25.8523C30.4645 25.739 30.6677 25.524 30.8242 25.2501C30.9806 24.9761 31.0625 24.6919 31.0625 24.4693V11.2435C31.0625 11.0216 30.9805 10.7392 30.8238 10.4679C30.667 10.1966 30.4635 9.98491 30.2715 9.87455L18.582 3.15275C18.3912 3.04273 18.1054 2.97271 17.7915 2.97339C17.4777 2.97408 17.192 3.045 17.0007 3.15607ZM6.3957 11.3642C6.53284 11.1245 6.83831 11.0414 7.07799 11.1785L16.9733 16.8405C17.3553 17.0587 17.6738 17.4171 17.8953 17.7985C18.1169 18.1801 18.2703 18.6338 18.2717 19.0733L18.2893 30.4075C18.2897 30.6837 18.0662 30.9079 17.7901 30.9083C17.5139 30.9087 17.2897 30.6852 17.2893 30.4091L17.2717 19.0767C17.2708 18.8547 17.1879 18.5717 17.0305 18.3007C16.8729 18.0294 16.6691 17.8183 16.4776 17.709L6.58136 12.0465C6.34168 11.9093 6.25855 11.6039 6.3957 11.3642Z" fill="#4db6ac"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.0809 2.28613C18.7002 2.0665 18.2304 1.97243 17.7893 1.9734C17.3481 1.97436 16.8787 2.07053 16.4985 2.29133L4.76515 9.10978C4.38527 9.33044 4.06884 9.69007 3.84874 10.0725C3.6286 10.455 3.47656 10.9093 3.47656 11.349V24.4715C3.47656 24.9118 3.62953 25.3658 3.85033 25.7477C4.07118 26.1297 4.38804 26.4882 4.76735 26.7085L16.6135 33.5647C16.9954 33.7857 17.4651 33.8801 17.9064 33.8782C18.3475 33.8762 18.8161 33.7778 19.1954 33.5537L30.7814 26.7133C31.1591 26.4902 31.4737 26.1292 31.6925 25.746C31.9114 25.3627 32.0625 24.9084 32.0625 24.4693V11.2435C32.0625 10.8037 31.9104 10.3497 31.6896 9.96764C31.4689 9.58563 31.1515 9.22695 30.7698 9.00759L19.0809 2.28613ZM29.6625 11.8015C29.786 12.0485 29.6859 12.3489 29.4389 12.4723L20.3956 16.994C20.1486 17.1175 19.8483 17.0174 19.7248 16.7704C19.6013 16.5234 19.7014 16.2231 19.9484 16.0996L28.9917 11.5779C29.2387 11.4544 29.539 11.5545 29.6625 11.8015Z" fill="#bdbdbd"/>
-</svg>

resources/images/toolbar_sketch.svg

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <!-- Pencil body -->
-  <path d="M28.5 6.5l5 5L14 31l-5.5 1.5L10 27 28.5 6.5z" style="fill:#009688"/>
-  <!-- Pencil tip (dark) -->
-  <path d="M8.5 28.5l1.5 1.5 4.5-1L28.5 15l-3.5-3.5L8.5 28z" style="fill:#2b3436"/>
-  <!-- Pencil line -->
-  <line x1="10" y1="26" x2="25" y2="11" stroke="#2b3436" stroke-width="2"/>
-</svg>

resources/images/toolbar_sketch_dark.svg

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <!-- Pencil body (dark mode colors) -->
-  <path d="M28.5 6.5l5 5L14 31l-5.5 1.5L10 27 28.5 6.5z" style="fill:#4db6ac"/>
-  <!-- Pencil tip -->
-  <path d="M8.5 28.5l1.5 1.5 4.5-1L28.5 15l-3.5-3.5L8.5 28z" style="fill:#e0e0e0"/>
-  <!-- Pencil line -->
-  <line x1="10" y1="26" x2="25" y2="11" stroke="#e0e0e0" stroke-width="2"/>
-</svg>

resources/profiles/Creality.json

@@ -1,6 +1,6 @@
 {
 	"name": "Creality",
-	"version": "02.03.02.86",
+	"version": "02.03.02.87",
 	"force_update": "0",
 	"description": "Creality configurations",
 	"machine_model_list": [

resources/profiles/Creality/creality_ender2pro_buildplate_texture.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 175 175"><path d="M59.89,164.54s.06.03.06.06v1.7s-.03.06-.06.06l-5.42.02c-1.6,0-2.89,1.31-2.87,2.92.02,1.58,1.34,2.83,2.91,2.83h5.37s.06.03.06.06v1.7s-.03.06-.06.06h-5.36c-2.66,0-4.82-2.18-4.74-4.84.07-2.47,2.07-4.47,4.53-4.55l5.57-.02ZM68.08,170.15c1.56,0,2.82-1.28,2.8-2.85-.02-1.54-1.31-2.77-2.85-2.77h-6.85s-.06.03-.06.06v9.3s.03.06.06.06h1.7s.06-.03.06-.06v-7.47s.03-.06.06-.06h5.05c.53,0,.98.41,1,.94.02.56-.43,1.01-.98,1.01h-4.83c-.06,0-.08.07-.04.11l5.5,5.51s.03.02.04.02h2.4c.06,0,.08-.07.04-.11l-3.69-3.7s0,0,0,0h.57ZM96.24,164.54h-1.7s-.06.03-.06.06v8.3c0,.58.47,1.05,1.05,1.05h6.76s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-5.92s-.06-.03-.06-.06v-7.47s-.03-.06-.06-.06M88.42,164.61c-.05-.08-.17-.08-.22,0l-5.34,9.26s.03.05.06.1h1.96s.04-.02.05-.03l3.32-5.76h.11l2.23,3.87s-.03.05-.06.1h-2.91s-.04.02-.05.03l-.98,1.7s.03.05.05.1c1.58,0,6.28,0,7.05,0,.05,0,.08-.05.05-.09-.58-1-5.33-9.26-5.33-9.26M125.16,164.54h-2.22s-.04,0-.05.02l-3.22,3.85s-.07.03-.1,0l-3.23-3.85s-.03-.02-.05-.02c-.49,0-7.47,0-10.16,0-.04,0-.06.03-.06.06v1.7s.03.06.06.06h3.67s.06.03.06.06v7.47s.03.06.06.06h1.7s.06-.03.06-.06v-7.47s.03-.06.06-.06h3.69s.04,0,.05.02l3.2,3.82s.02.03.02.04v3.65s.03.06.06.06h1.7s.06-.03.06-.06v-3.65s0-.03.02-.04l4.66-5.56s0-.1-.05-.1M103.47,173.96h1.7s.06-.03.06-.06v-9.29s-.03-.06-.06-.06h-1.7s-.06.03-.06.06v9.29s.03.06.06.06M81.84,166.31v-1.7s-.03-.06-.06-.06h-5.28c-2.6,0-4.71,2.11-4.71,4.71s2.11,4.71,4.71,4.71h5.28s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-5.28c-1.27,0-2.35-.83-2.74-1.97h8.02s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-8.02c.38-1.14,1.46-1.97,2.74-1.97h5.28s.06-.03.06-.06" style="fill:#bcbec0;"/></svg>

resources/profiles/Creality/creality_sermoond3_buildplate_texture.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 175 175"><path d="M59.89,164.54s.06.03.06.06v1.7s-.03.06-.06.06l-5.42.02c-1.6,0-2.89,1.31-2.87,2.92.02,1.58,1.34,2.83,2.91,2.83h5.37s.06.03.06.06v1.7s-.03.06-.06.06h-5.36c-2.66,0-4.82-2.18-4.74-4.84.07-2.47,2.07-4.47,4.53-4.55l5.57-.02ZM68.08,170.15c1.56,0,2.82-1.28,2.8-2.85-.02-1.54-1.31-2.77-2.85-2.77h-6.85s-.06.03-.06.06v9.3s.03.06.06.06h1.7s.06-.03.06-.06v-7.47s.03-.06.06-.06h5.05c.53,0,.98.41,1,.94.02.56-.43,1.01-.98,1.01h-4.83c-.06,0-.08.07-.04.11l5.5,5.51s.03.02.04.02h2.4c.06,0,.08-.07.04-.11l-3.69-3.7s0,0,0,0h.57ZM96.24,164.54h-1.7s-.06.03-.06.06v8.3c0,.58.47,1.05,1.05,1.05h6.76s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-5.92s-.06-.03-.06-.06v-7.47s-.03-.06-.06-.06M88.42,164.61c-.05-.08-.17-.08-.22,0l-5.34,9.26s.03.05.06.1h1.96s.04-.02.05-.03l3.32-5.76h.11l2.23,3.87s-.03.05-.06.1h-2.91s-.04.02-.05.03l-.98,1.7s.03.05.05.1c1.58,0,6.28,0,7.05,0,.05,0,.08-.05.05-.09-.58-1-5.33-9.26-5.33-9.26M125.16,164.54h-2.22s-.04,0-.05.02l-3.22,3.85s-.07.03-.1,0l-3.23-3.85s-.03-.02-.05-.02c-.49,0-7.47,0-10.16,0-.04,0-.06.03-.06.06v1.7s.03.06.06.06h3.67s.06.03.06.06v7.47s.03.06.06.06h1.7s.06-.03.06-.06v-7.47s.03-.06.06-.06h3.69s.04,0,.05.02l3.2,3.82s.02.03.02.04v3.65s.03.06.06.06h1.7s.06-.03.06-.06v-3.65s0-.03.02-.04l4.66-5.56s0-.1-.05-.1M103.47,173.96h1.7s.06-.03.06-.06v-9.29s-.03-.06-.06-.06h-1.7s-.06.03-.06.06v9.29s.03.06.06.06M81.84,166.31v-1.7s-.03-.06-.06-.06h-5.28c-2.6,0-4.71,2.11-4.71,4.71s2.11,4.71,4.71,4.71h5.28s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-5.28c-1.27,0-2.35-.83-2.74-1.97h8.02s.06-.03.06-.06v-1.7s-.03-.06-.06-.06h-8.02c.38-1.14,1.46-1.97,2.74-1.97h5.28s.06-.03.06-.06" style="fill:#bcbec0;"/></svg>

resources/profiles/Creality/machine/Creality Ender-2 Pro.json

@@ -2,9 +2,9 @@
 	"type": "machine_model",
 	"name": "Creality Ender-2 Pro",
 	"nozzle_diameter": "0.4",
-	"bed_model": "creality_k1_buildplate_model.stl",
+	"bed_model": "creality_ender2pro_buildplate_model.stl",
 	"default_bed_type": "Cool Plate",
-	"bed_texture": "",
+	"bed_texture": "creality_ender2pro_buildplate_texture.svg",
 	"family": "Creality",
 	"hotend_model": "",
 	"machine_tech": "FFF",

resources/profiles/Creality/machine/Creality Sermoon D3 Pro.json

@@ -2,9 +2,9 @@
 	"type": "machine_model",
 	"name": "Creality Sermoon D3 Pro",
 	"nozzle_diameter": "0.4",
-	"bed_model": "creality_cr10v2_buildplate_model.stl",
+	"bed_model": "creality_sermoond3_buildplate_model.stl",
 	"default_bed_type": "High Temp Plate",
-	"bed_texture": "creality_cr10v2_buildplate_texture.svg",
+	"bed_texture": "creality_sermoond3_buildplate_texture.svg",
 	"family": "Creality",
 	"hotend_model": "",
 	"machine_tech": "FFF",

resources/profiles/Creality/machine/Creality Sermoon D3.json

@@ -2,9 +2,9 @@
 	"type": "machine_model",
 	"name": "Creality Sermoon D3",
 	"nozzle_diameter": "0.4",
-	"bed_model": "creality_cr10v2_buildplate_model.stl",
+	"bed_model": "creality_sermoond3_buildplate_model.stl",
 	"default_bed_type": "High Temp Plate",
-	"bed_texture": "creality_cr10v2_buildplate_texture.svg",
+	"bed_texture": "creality_sermoond3_buildplate_texture.svg",
 	"family": "Creality",
 	"hotend_model": "",
 	"machine_tech": "FFF",

resources/profiles/Creality/machine/Creality Sermoon V1 Pro.json

@@ -2,9 +2,9 @@
 	"type": "machine_model",
 	"name": "Creality Sermoon V1 Pro",
 	"nozzle_diameter": "0.4",
-	"bed_model": "creality_k1_buildplate_model.stl",
+	"bed_model": "creality_sermoonv1_buildplate_model.stl",
 	"default_bed_type": "Cool Plate",
-	"bed_texture": "",
+	"bed_texture": "creality_sermoonv1_buildplate_texture.svg",
 	"family": "Creality",
 	"hotend_model": "",
 	"machine_tech": "FFF",

resources/profiles/Kingroon.json

@@ -1,7 +1,7 @@
 {
 	"name": "Kingroon",
 	"url": "https://kingroon.com/",
-	"version": "02.04.00.03",
+	"version": "02.04.00.04",
 	"force_update": "1",
 	"description": "Kingroon configuration files",
 	"machine_model_list": [

resources/profiles/Kingroon/machine/Kingroon KLP1.json

@@ -5,6 +5,8 @@
 	"nozzle_diameter": "0.4",
 	"machine_tech": "FFF",
 	"family": "Kingroon",
+	"bed_model": "klp1_bed.stl",
+	"bed_texture": "Kingroon_buildplate.svg",
 	"hotend_model": "",
 	"default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System"
 }

resources/profiles/Kingroon/machine/Kingroon KP3S 3.0.json

@@ -5,8 +5,8 @@
 	"nozzle_diameter": "0.4",
 	"machine_tech": "FFF",
 	"family": "Kingroon",
-	"bed_model": "kp3s_bed.stl",
+	"bed_model": "mini_bed.stl",
-	"bed_texture": "Kingroon_buildplate.png",
+	"bed_texture": "Kingroon_buildplate.svg",
 	"hotend_model": "",
 	"default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System"
 }

resources/profiles/Kingroon/machine/Kingroon KP3S PRO S1.json

@@ -6,7 +6,7 @@
 	"machine_tech": "FFF",
 	"family": "Kingroon",
 	"bed_model": "kp3s_bed.stl",
-	"bed_texture": "Kingroon_buildplate.png",
+	"bed_texture": "Kingroon_buildplate.svg",
 	"hotend_model": "",
 	"default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System"
 }

resources/profiles/Kingroon/machine/Kingroon KP3S PRO V2.json

@@ -6,7 +6,7 @@
 	"machine_tech": "FFF",
 	"family": "Kingroon",
 	"bed_model": "kp3s_bed.stl",
-	"bed_texture": "Kingroon_buildplate.png",
+	"bed_texture": "Kingroon_buildplate.svg",
 	"hotend_model": "",
 	"default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System"
 }

resources/profiles/Kingroon/machine/Kingroon KP3S V1.json

@@ -5,6 +5,8 @@
 	"nozzle_diameter": "0.4",
 	"machine_tech": "FFF",
 	"family": "Kingroon",
+	"bed_model": "mini_bed.stl",
+	"bed_texture": "Kingroon_buildplate.svg",
 	"hotend_model": "",
 	"default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System"
 }

resources/profiles/M3D/m3d_enabler_D7500_bed_texture.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1500 1500"><path d="M29.68,1368.29s3.73,2.89,7.45,7.47c2.29,2.81,5.74,8.39,5.74,8.39v82.8h-13.19v-98.66M143.01,1368.29s-3.73,2.89-7.45,7.47c-2.29,2.81-5.74,8.39-5.74,8.39v82.8h13.19v-98.66M32.34,1324.97s3.14,5.91,3.56,11.77c.41,5.69-.93,13.13-2.99,17.31-2.17,4.4-4.52,7.63-4.52,7.63,0,0,6.1-.3,11.09.41,5.03.71,10.27,2.28,10.27,2.28,0,0,.86-3.6.53-8.91-.35-5.52-3.4-14.49-8.27-21.53-4.58-6.62-9.66-8.96-9.66-8.96M20,1304.94s1.2,7.42,6.27,11.5c4.58,3.68,10.86,4.58,15.65,10.02,4.12,4.67,5.95,11.11,5.95,11.11,0,0,2.81-9.95-1.64-17.48-3.91-6.61-11.16-9.2-18.08-11.26-4.6-1.39-8.15-3.88-8.15-3.88M140.35,1324.97s-5.08,2.34-9.66,8.96c-4.88,7.04-7.92,16.01-8.28,21.53-.34,5.32.53,8.91.53,8.91,0,0,5.24-1.57,10.28-2.28,4.98-.71,11.08-.41,11.08-.41,0,0-2.35-3.23-4.52-7.63-2.06-4.18-3.41-11.62-2.99-17.31.42-5.87,3.56-11.77,3.56-11.77M152.69,1304.94s-3.55,2.49-8.16,3.88c-6.92,2.07-14.16,4.65-18.08,11.26-4.45,7.54-1.64,17.48-1.64,17.48,0,0,1.83-6.44,5.95-11.11,4.79-5.44,11.07-6.34,15.65-10.02,5.08-4.08,6.28-11.5,6.28-11.5M121.68,1367.1c15.84-4.35,22.24-2.94,22.24-2.94,0,0-7.85,5.86-11.85,11.5-2.99,4.22-5.19,8.43-8.33,12.21-2.51,3.02-9.94,6.82-13.2,9-1.72,1.15-3.71,2.53-5.1,4.2-.79.95-1.15,2.56-1.15,2.56,0,0,2.35-2.16,4.44-3.56,3.02-2.02,5.81-2.93,5.81-2.93,0,0-2.47,3.13-4.81,6.87-1.02,1.62-1.38,4.89-1.88,9.33-.03.27.5,2.97-1.47,7.84-1.14,2.83-2.96,4.25-2.96,4.25,0,0,.47-1.39.47-1.88s-.27-.93-.27-.93c0,0-.94,1.52-2.11,3.17-1.17,1.64-3.61,3.2-3.61,3.2,0,0,.53.16,1.2,0,.26-.07,1.23-.18,1.23-.18,0,0-.6,2.36-2.17,5.37-2.64,5.04-2.76,8.04-2.76,8.04,0,0-.52-.35-.58-1.12-.06-.78-.46-1.1-.46-1.1,0,0-.24.25-.83.22-.59-.03-.91.08-.91.08,0,0,2.36,2.25,2.28,9.51-.04,3.32-.55,5.27-1.66,8.11-1.56,3.99-4.63,4.1-6.52,4.1-2.08,0-4.89-.35-6.51-4.1-1.21-2.8-1.62-4.78-1.66-8.11-.08-7.26,2.28-9.51,2.28-9.51,0,0-.33-.11-.91-.08-.59.03-.84-.22-.84-.22,0,0-.4.32-.46,1.1-.05.77-.59,1.12-.59,1.12,0,0-.12-2.99-2.76-8.04-1.57-3.01-2.17-5.37-2.17-5.37,0,0,.97.11,1.23.18.67.16,1.2,0,1.2,0,0,0-2.43-1.56-3.61-3.2-1.17-1.64-2.11-3.17-2.11-3.17,0,0-.25.44-.25.93s.47,1.88.47,1.88c0,0-1.82-1.43-2.96-4.26-1.97-4.87-1.44-7.57-1.47-7.83-.49-4.44-.86-7.71-1.87-9.33-2.34-3.74-4.81-6.87-4.81-6.87,0,0,2.78.92,5.8,2.93,2.09,1.4,4.44,3.56,4.44,3.56,0,0-.36-1.61-1.15-2.56-1.38-1.68-3.39-3.05-5.11-4.21-3.25-2.18-10.7-5.99-13.2-9-3.15-3.78-5.3-8.02-8.34-12.21-5.75-7.92-11.85-11.5-11.85-11.5,0,0,6.4-1.41,22.24,2.93,5.75,1.58,12.19,4.39,18.43,7.98,6.33,3.64,12.44,8.11,15.84,14.79,0,0,.38.66.7.66s.7-.66.7-.66c3.4-6.68,9.51-11.14,15.84-14.79,6.23-3.59,12.67-6.4,18.42-7.98M71.64,1421.16c1.61,2.11,4.42,1.52,4.42,1.52,0,0-1.95-1.4-3.24-2.69-1.21-1.21-2.43-2.59-2.43-2.59,0,0-.35,1.64,1.25,3.76M81.25,1451.77c.18,1.69.74,1.5.74,1.5,0,0-.14-.75-.17-1.66-.03-.91.08-1.44.02-2.73-.06-1.33-.47-2.01-.47-2.01,0,0-.2,1.06-.2,1.7s-.11,1.32.09,3.2M85.28,1459.11s-.2-1.57-.08-2.93c.12-1.37.37-2.51.23-3.86-.13-1.35-1.23-2.48-1.23-2.48,0,0-1.39,1.45-1.66,3.48-.33,2.42.67,3.72,1.29,4.58.62.86,1.45,1.21,1.45,1.21M86.2,1443.64c.11-1.82-.05-3.6-.05-3.6,0,0-1.17,1.17-1.26,3.39-.1,2.52.89,5.31.89,5.31,0,0,.29-3.29.41-5.1M86.48,1431s1.9-16.15,1.9-18.65c0-2.86-1.38-4.74-1.9-7.72-.79,2.81-2,4.09-2,7.59s2,18.78,2,18.78M87.22,1443.64c.12,1.82.42,5.1.42,5.1,0,0,.99-2.79.89-5.31-.09-2.21-1.26-3.38-1.26-3.38,0,0-.16,1.77-.05,3.59M89.59,1457.89c.62-.86,1.62-2.15,1.29-4.58-.28-2.03-1.66-3.48-1.66-3.48,0,0-1.1,1.13-1.23,2.48-.14,1.35.12,2.48.23,3.86.11,1.37-.08,2.93-.08,2.93,0,0,.83-.35,1.45-1.21M92.17,1451.77c.2-1.88.09-2.55.09-3.2s-.21-1.7-.21-1.7c0,0-.41.68-.47,2.01-.06,1.29.05,1.82.02,2.73-.03.91-.16,1.66-.16,1.66,0,0,.56.19.74-1.5M101.77,1421.16c1.6-2.11,1.25-3.75,1.25-3.75,0,0-1.21,1.37-2.42,2.58-1.3,1.3-3.24,2.69-3.24,2.69,0,0,2.81.59,4.42-1.52M188.86,1392.73c1.15-5.38,5.01-11.16,15.69-11.16s14.63,5.12,14.63,11.61c0,7.16-4.15,10.3-16.19,10.3h-6.28v19.06h8.55c12.05,0,17.97,4.38,17.97,13.44s-6.6,13.76-16.83,13.76c-12.05,0-17.73-5.25-19.58-12.77h-24.73c2.46,17.06,14.97,31.89,42.96,31.89s43.36-13.83,43.36-32.06c0-16.26-10.99-22.26-18.09-24.71v-.3c4.47-1.56,14.05-6.66,14.05-20.1,0-16.02-12.82-28.86-39-28.86-28.93,0-39.09,17.19-40.92,29.9h24.41ZM259.09,1466.95h45.67c29.75,0,53.81-20.17,53.81-52.88,0-26.96-18.84-49.31-53.28-49.31h-46.2v102.2ZM283.89,1383.85h17.91c20.6.26,30.48,11.98,30.48,30.89,0,21.73-10.81,32.99-30.8,32.99h-17.6v-63.88Z" style="fill:#bcbec0;"/></svg>

resources/profiles/M3D/m3d_enabler_D8500_bed_texture.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2100 1500"><path d="M29.68,1368.29s3.73,2.89,7.45,7.47c2.29,2.81,5.74,8.39,5.74,8.39v82.8h-13.19v-98.66M143.01,1368.29s-3.73,2.89-7.45,7.47c-2.29,2.81-5.74,8.39-5.74,8.39v82.8h13.19v-98.66M32.34,1324.97s3.14,5.91,3.56,11.77c.41,5.69-.93,13.13-2.99,17.31-2.17,4.4-4.52,7.63-4.52,7.63,0,0,6.1-.3,11.09.41,5.03.71,10.27,2.28,10.27,2.28,0,0,.86-3.6.53-8.91-.35-5.52-3.4-14.49-8.27-21.53-4.58-6.62-9.66-8.96-9.66-8.96M20,1304.94s1.2,7.42,6.27,11.5c4.58,3.68,10.86,4.58,15.65,10.02,4.12,4.67,5.95,11.11,5.95,11.11,0,0,2.81-9.95-1.64-17.48-3.91-6.61-11.16-9.2-18.08-11.26-4.6-1.39-8.15-3.88-8.15-3.88M140.35,1324.97s-5.08,2.34-9.66,8.96c-4.88,7.04-7.92,16.01-8.28,21.53-.34,5.32.53,8.91.53,8.91,0,0,5.24-1.57,10.28-2.28,4.98-.71,11.08-.41,11.08-.41,0,0-2.35-3.23-4.52-7.63-2.06-4.18-3.41-11.62-2.99-17.31.42-5.87,3.56-11.77,3.56-11.77M152.69,1304.94s-3.55,2.49-8.16,3.88c-6.92,2.07-14.16,4.65-18.08,11.26-4.45,7.54-1.64,17.48-1.64,17.48,0,0,1.83-6.44,5.95-11.11,4.79-5.44,11.07-6.34,15.65-10.02,5.08-4.08,6.28-11.5,6.28-11.5M121.68,1367.1c15.84-4.35,22.24-2.94,22.24-2.94,0,0-7.85,5.86-11.85,11.5-2.99,4.22-5.19,8.43-8.33,12.21-2.51,3.02-9.94,6.82-13.2,9-1.72,1.15-3.71,2.53-5.1,4.2-.79.95-1.15,2.56-1.15,2.56,0,0,2.35-2.16,4.44-3.56,3.02-2.02,5.81-2.93,5.81-2.93,0,0-2.47,3.13-4.81,6.87-1.02,1.62-1.38,4.89-1.88,9.33-.03.27.5,2.97-1.47,7.84-1.14,2.83-2.96,4.25-2.96,4.25,0,0,.47-1.39.47-1.88s-.27-.93-.27-.93c0,0-.94,1.52-2.11,3.17-1.17,1.64-3.61,3.2-3.61,3.2,0,0,.53.16,1.2,0,.26-.07,1.23-.18,1.23-.18,0,0-.6,2.36-2.17,5.37-2.64,5.04-2.76,8.04-2.76,8.04,0,0-.52-.35-.58-1.12-.06-.78-.46-1.1-.46-1.1,0,0-.24.25-.83.22-.59-.03-.91.08-.91.08,0,0,2.36,2.25,2.28,9.51-.04,3.32-.55,5.27-1.66,8.11-1.56,3.99-4.63,4.1-6.52,4.1-2.08,0-4.89-.35-6.51-4.1-1.21-2.8-1.62-4.78-1.66-8.11-.08-7.26,2.28-9.51,2.28-9.51,0,0-.33-.11-.91-.08-.59.03-.84-.22-.84-.22,0,0-.4.32-.46,1.1-.05.77-.59,1.12-.59,1.12,0,0-.12-2.99-2.76-8.04-1.57-3.01-2.17-5.37-2.17-5.37,0,0,.97.11,1.23.18.67.16,1.2,0,1.2,0,0,0-2.43-1.56-3.61-3.2-1.17-1.64-2.11-3.17-2.11-3.17,0,0-.25.44-.25.93s.47,1.88.47,1.88c0,0-1.82-1.43-2.96-4.26-1.97-4.87-1.44-7.57-1.47-7.83-.49-4.44-.86-7.71-1.87-9.33-2.34-3.74-4.81-6.87-4.81-6.87,0,0,2.78.92,5.8,2.93,2.09,1.4,4.44,3.56,4.44,3.56,0,0-.36-1.61-1.15-2.56-1.38-1.68-3.39-3.05-5.11-4.21-3.25-2.18-10.7-5.99-13.2-9-3.15-3.78-5.3-8.02-8.34-12.21-5.75-7.92-11.85-11.5-11.85-11.5,0,0,6.4-1.41,22.24,2.93,5.75,1.58,12.19,4.39,18.43,7.98,6.33,3.64,12.44,8.11,15.84,14.79,0,0,.38.66.7.66s.7-.66.7-.66c3.4-6.68,9.51-11.14,15.84-14.79,6.23-3.59,12.67-6.4,18.42-7.98M71.64,1421.16c1.61,2.11,4.42,1.52,4.42,1.52,0,0-1.95-1.4-3.24-2.69-1.21-1.21-2.43-2.59-2.43-2.59,0,0-.35,1.64,1.25,3.76M81.25,1451.77c.18,1.69.74,1.5.74,1.5,0,0-.14-.75-.17-1.66-.03-.91.08-1.44.02-2.73-.06-1.33-.47-2.01-.47-2.01,0,0-.2,1.06-.2,1.7s-.11,1.32.09,3.2M85.28,1459.11s-.2-1.57-.08-2.93c.12-1.37.37-2.51.23-3.86-.13-1.35-1.23-2.48-1.23-2.48,0,0-1.39,1.45-1.66,3.48-.33,2.42.67,3.72,1.29,4.58.62.86,1.45,1.21,1.45,1.21M86.2,1443.64c.11-1.82-.05-3.6-.05-3.6,0,0-1.17,1.17-1.26,3.39-.1,2.52.89,5.31.89,5.31,0,0,.29-3.29.41-5.1M86.48,1431s1.9-16.15,1.9-18.65c0-2.86-1.38-4.74-1.9-7.72-.79,2.81-2,4.09-2,7.59s2,18.78,2,18.78M87.22,1443.64c.12,1.82.42,5.1.42,5.1,0,0,.99-2.79.89-5.31-.09-2.21-1.26-3.38-1.26-3.38,0,0-.16,1.77-.05,3.59M89.59,1457.89c.62-.86,1.62-2.15,1.29-4.58-.28-2.03-1.66-3.48-1.66-3.48,0,0-1.1,1.13-1.23,2.48-.14,1.35.12,2.48.23,3.86.11,1.37-.08,2.93-.08,2.93,0,0,.83-.35,1.45-1.21M92.17,1451.77c.2-1.88.09-2.55.09-3.2s-.21-1.7-.21-1.7c0,0-.41.68-.47,2.01-.06,1.29.05,1.82.02,2.73-.03.91-.16,1.66-.16,1.66,0,0,.56.19.74-1.5M101.77,1421.16c1.6-2.11,1.25-3.75,1.25-3.75,0,0-1.21,1.37-2.42,2.58-1.3,1.3-3.24,2.69-3.24,2.69,0,0,2.81.59,4.42-1.52M188.86,1392.73c1.15-5.38,5.01-11.16,15.69-11.16s14.63,5.12,14.63,11.61c0,7.16-4.15,10.3-16.19,10.3h-6.28v19.06h8.55c12.05,0,17.97,4.38,17.97,13.44s-6.6,13.76-16.83,13.76c-12.05,0-17.73-5.25-19.58-12.77h-24.73c2.46,17.06,14.97,31.89,42.96,31.89s43.36-13.83,43.36-32.06c0-16.26-10.99-22.26-18.09-24.71v-.3c4.47-1.56,14.05-6.66,14.05-20.1,0-16.02-12.82-28.86-39-28.86-28.93,0-39.09,17.19-40.92,29.9h24.41ZM259.09,1466.95h45.67c29.75,0,53.81-20.17,53.81-52.88,0-26.96-18.84-49.31-53.28-49.31h-46.2v102.2ZM283.89,1383.85h17.91c20.6.26,30.48,11.98,30.48,30.89,0,21.73-10.81,32.99-30.8,32.99h-17.6v-63.88Z" style="fill:#bcbec0;"/></svg>

resources/profiles/M3D/machine/M3D Enabler D7500.json

@@ -5,6 +5,6 @@
 	"family": "M3D",
 	"machine_tech": "FFF",
 	"nozzle_diameter": "0.4",
-	"bed_texture": "model/M3D_bed_texture.png",
+	"bed_texture": "m3d_enabler_D7500_bed_texture.svg",
 	"default_materials": "Generic PLA @System"
 }

resources/profiles/M3D/machine/M3D Enabler D8500.json

@@ -5,7 +5,7 @@
 	"family": "M3D",
 	"machine_tech": "FFF",
 	"nozzle_diameter": "0.4",
-	"bed_model": "model/M3D_bed_model.stl",
+	"bed_model": "m3d_enabler_D8500_bed_model.stl",
-	"bed_texture": "model/M3D_bed_texture.png",
+	"bed_texture": "m3d_enabler_D8500_bed_texture.svg",
 	"default_materials": "Generic PLA @System"
 }