mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-17 10:32:20 +00:00
807520ca1d
* Update eigen from v3.3.7 to v5.0.1. This updates eigen from v3.3.7 released on December 11, 2018-12-11 to v5.0.1 released on 2025-11-11. There have be a large number of bug-fixes, optimizations, and improvements between these releases. See the details at; https://gitlab.com/libeigen/eigen/-/releases It retains the previous custom minimal `CMakeLists.txt`, and adds a README-OrcaSlicer.md that explains what version and parts of the upstream eigen release have been included, and where the full release can be found. * Update libigl from v2.0.0 (or older) to v2.6.0. This updates libigl from what was probably v2.0.0 released on 2018-10-16 to v2.6.0 released on 2025-05-15. It's possible the old version was even older than that but there is no version indicators in the code and I ran out of patience identifying missing changes and only went back as far as v2.0.0. There have been a large number of bug-fixes, optimizations, and improvements between these versions. See the following for details; https://github.com/libigl/libigl/releases I retained the minimal custom `CMakeLists.txt`, added `README.md` from the libigl distribution which identifies the version, and added a README-OrcaSlicer.md that details the version and parts that have been included. * Update libslic3r for libigl v2.6.0 changes. This updates libslic3r for all changes moving to eigen v5.0.1 and libigl v2.6.0. Despite the large number of updates to both dependencies, no changes were required for the eigen update, and only one change was required for the libigl update. For libigl, `igl::Hit` was changed to a template taking the Scalar type to use. Previously it was hard-coded to `float`, so to minimize possible impact I've updated all places it is used from `igl::Hit` to `igl::Hit<float>`. * Add compiler option `-DNOMINMAX` for libigl with MSVC. MSVC by default defines `min(()` and `max()` macros that break `std::numeric_limits<>::max()`. The upstream cmake that we don't include adds `-DNOMINMAX` for the libigl module when compiling with MSVC, so we need to add the same thing here. * Fix src/libslic3r/TriangleMeshDeal.cpp for the unmodified upstream libigl. This fixes `TriangleMeshDeal.cpp` to work with the unmodified upstream libigl v2.6.0. loop.{h,cpp} implementation. This file and feature was added in PR "BBS Port: Mesh Subdivision" (#12150) which included changes to `loop.{h,cpp}` in the old version of libigl. This PR avoids modifying the included dependencies, and uses the updated upstream versions of those files without any modifications, which requires fixing TriangleMeshDeal.cpp to work with them. In particular, the modifications made to `loop.{h,cpp}` included changing the return type from void to bool, adding additional validation checking of the input meshes, and returning false if they failed validation. These added checks looked unnecessary and would only have caught problems if the input mesh was very corrupt. To make `TriangleMeshDeal.cpp` work without this built-in checking functionality, I removed checking/handling of any `false` return value. There was also a hell of a lot of redundant copying and casting back and forth between float and double, so I cleaned that up. The input and output meshs use floats for the vertexes, and there would be no accuracy benefits from casting to and from doubles for the simple weighted average operations done by igl::loop(). So this just uses `Eigen:Map` to use the original input mesh vertex data directly without requiring any copy or casting. * Move eigen from included `deps_src` to externaly fetched `deps`. This copys what PrusaSlicer did and moved it from an included dependency under `deps_src` to an externaly fetched dependency under `deps`. This requires updating some `CMakeList.txt` configs and removing the old and obsolete `cmake/modules/FindEigen3.cmake`. The details of when this was done in PrusaSlicer and the followup fixes are at; *21116995d7* https://github.com/prusa3d/PrusaSlicer/issues/13608 * https://github.com/prusa3d/PrusaSlicer/pull/13609 *e3c277b9eeFor some reason I don't fully understand this also required fixing `src/slic3r/GUI/GUI_App.cpp` by adding `#include <boost/nowide/cstdio.hpp>` to fix an `error: ‘remove’ is not a member of ‘boost::nowide'`. The main thing I don't understand is how it worked before. Note that this include is in the PrusaSlicer version of this file, but it also significantly deviates from what is currently in OrcaSlicer in many other ways. * Whups... I missed adding the deps/Eigen/Eigen.cmake file... * Tidy some whitespace indenting in CMakeLists.txt. * Ugh... tabs indenting needing fixes. * Change the include order of deps/Eigen. It turns out that although Boost includes some references to Eigen, Eigen also includes some references to Boost for supporting some of it's additional numeric types. I don't think it matters much since we are not using these features, but I think technically its more correct to say Eigen depends on Boost than the other way around, so I've re-ordered them. * Add source for Eigen 5.0.1 download to flatpak yml config. * Add explicit `DEPENDS dep_Boost to deps/Eigen. I missed this before. This ensures we don't rely on include orders to make sure Boost is installed before we configure Eigen. * Add `DEPENDS dep_Boost dep_GMP dep_MPFR` to deps/Eigen. It turns out Eigen can also use GMP and MPFR for multi-precision and multi-precision-rounded numeric types if they are available. Again, I don't think we are using these so it doesn't really matter, but it is technically correct and ensures they are there if we ever do need them. * Fix deps DEPENDENCY ordering for GMP, MPFR, Eigen, and CGAL. I think this is finally correct. Apparently CGAL also optionally depends on Eigen, so the correct dependency order from lowest to highest is GMP, MPFR, Eigen, and CGAL. --------- Co-authored-by: Donovan Baarda <dbaarda@google.com> Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
193 lines
7.8 KiB
C++
193 lines
7.8 KiB
C++
// This file is part of libigl, a simple c++ geometry processing library.
|
|
//
|
|
// Copyright (C) 2015 Alec Jacobson <alecjacobson@gmail.com>
|
|
// Qingnan Zhou <qnzhou@gmail.com>
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public License
|
|
// v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
|
// obtain one at http://mozilla.org/MPL/2.0/.
|
|
//
|
|
#ifndef IGL_COPYLEFT_CGAL_MESH_BOOLEAN_H
|
|
#define IGL_COPYLEFT_CGAL_MESH_BOOLEAN_H
|
|
|
|
#include "../../igl_inline.h"
|
|
#include "../../MeshBooleanType.h"
|
|
#include <Eigen/Core>
|
|
#include <functional>
|
|
#include <vector>
|
|
|
|
namespace igl
|
|
{
|
|
namespace copyleft
|
|
{
|
|
namespace cgal
|
|
{
|
|
/// Compute Boolean csg operations on "solid", consistently oriented
|
|
/// meshes.
|
|
///
|
|
/// @param[in] VA #VA by 3 list of vertex positions of first mesh
|
|
/// @param[in] FA #FA by 3 list of triangle indices into VA
|
|
/// @param[in] VB #VB by 3 list of vertex positions of second mesh
|
|
/// @param[in] FB #FB by 3 list of triangle indices into VB
|
|
/// @param[in] type type of boolean operation
|
|
/// @param[out] VC #VC by 3 list of vertex positions of boolean result mesh
|
|
/// @param[out] FC #FC by 3 list of triangle indices into VC
|
|
/// @param[out] J #FC list of indices into [FA;FA.rows()+FB] revealing "birth" facet
|
|
/// @return true if inputs induce a piecewise constant winding number
|
|
/// field and type is valid
|
|
///
|
|
/// \see mesh_boolean_cork, intersect_other, remesh_self_intersections
|
|
template <
|
|
typename DerivedVA,
|
|
typename DerivedFA,
|
|
typename DerivedVB,
|
|
typename DerivedFB,
|
|
typename DerivedVC,
|
|
typename DerivedFC,
|
|
typename DerivedJ>
|
|
IGL_INLINE bool mesh_boolean(
|
|
const Eigen::MatrixBase<DerivedVA > & VA,
|
|
const Eigen::MatrixBase<DerivedFA > & FA,
|
|
const Eigen::MatrixBase<DerivedVB > & VB,
|
|
const Eigen::MatrixBase<DerivedFB > & FB,
|
|
const MeshBooleanType & type,
|
|
Eigen::PlainObjectBase<DerivedVC > & VC,
|
|
Eigen::PlainObjectBase<DerivedFC > & FC,
|
|
Eigen::PlainObjectBase<DerivedJ > & J);
|
|
/// \overload
|
|
/// @param[in] type_str string describing type of boolean operation see mesh_boolean_type_to_funcs
|
|
template <
|
|
typename DerivedVA,
|
|
typename DerivedFA,
|
|
typename DerivedVB,
|
|
typename DerivedFB,
|
|
typename DerivedVC,
|
|
typename DerivedFC,
|
|
typename DerivedJ>
|
|
IGL_INLINE bool mesh_boolean(
|
|
const Eigen::MatrixBase<DerivedVA > & VA,
|
|
const Eigen::MatrixBase<DerivedFA > & FA,
|
|
const Eigen::MatrixBase<DerivedVB > & VB,
|
|
const Eigen::MatrixBase<DerivedFB > & FB,
|
|
const std::string & type_str,
|
|
Eigen::PlainObjectBase<DerivedVC > & VC,
|
|
Eigen::PlainObjectBase<DerivedFC > & FC,
|
|
Eigen::PlainObjectBase<DerivedJ > & J);
|
|
/// \overload
|
|
///
|
|
/// @param[in] wind_num_op function handle for filtering winding numbers from
|
|
/// tuples of integer values to [0,1] outside/inside values
|
|
/// @param[in] keep function handle for determining if a patch should be "kept"
|
|
/// in the output based on the winding number on either side
|
|
template <
|
|
typename DerivedVA,
|
|
typename DerivedFA,
|
|
typename DerivedVB,
|
|
typename DerivedFB,
|
|
typename DerivedVC,
|
|
typename DerivedFC,
|
|
typename DerivedJ>
|
|
IGL_INLINE bool mesh_boolean(
|
|
const Eigen::MatrixBase<DerivedVA> & VA,
|
|
const Eigen::MatrixBase<DerivedFA> & FA,
|
|
const Eigen::MatrixBase<DerivedVB> & VB,
|
|
const Eigen::MatrixBase<DerivedFB> & FB,
|
|
const std::function<int(const Eigen::Matrix<int,1,Eigen::Dynamic>) >& wind_num_op,
|
|
const std::function<int(const int, const int)> & keep,
|
|
Eigen::PlainObjectBase<DerivedVC > & VC,
|
|
Eigen::PlainObjectBase<DerivedFC > & FC,
|
|
Eigen::PlainObjectBase<DerivedJ > & J);
|
|
/// Variadic mesh Boolean operations
|
|
///
|
|
/// @param[in] Vlist k-long list of lists of mesh vertex positions
|
|
/// @param[in] Flist k-long list of lists of mesh face indices, so that Flist[i] indexes
|
|
/// vertices in Vlist[i]
|
|
/// @param[in] wind_num_op function handle for filtering winding numbers from
|
|
/// n-tuples of integer values to [0,1] outside/inside values
|
|
/// @param[in] keep function handle for determining if a patch should be "kept"
|
|
/// in the output based on the winding number on either side
|
|
/// @param[out] VC #VC by 3 list of vertex positions of boolean result mesh
|
|
/// @param[out] FC #FC by 3 list of triangle indices into VC
|
|
/// @param[out] J #FC list of indices into [Flist[0];Flist[1];...;Flist[k]]
|
|
/// revealing "birth" facet
|
|
/// @return true iff inputs induce a piecewise constant winding number
|
|
/// field
|
|
template <
|
|
typename DerivedV,
|
|
typename DerivedF,
|
|
typename DerivedVC,
|
|
typename DerivedFC,
|
|
typename DerivedJ>
|
|
IGL_INLINE bool mesh_boolean(
|
|
const std::vector<DerivedV > & Vlist,
|
|
const std::vector<DerivedF > & Flist,
|
|
const std::function<int(const Eigen::Matrix<int,1,Eigen::Dynamic>) >& wind_num_op,
|
|
const std::function<int(const int, const int)> & keep,
|
|
Eigen::PlainObjectBase<DerivedVC > & VC,
|
|
Eigen::PlainObjectBase<DerivedFC > & FC,
|
|
Eigen::PlainObjectBase<DerivedJ > & J);
|
|
/// \overload
|
|
template <
|
|
typename DerivedV,
|
|
typename DerivedF,
|
|
typename DerivedVC,
|
|
typename DerivedFC,
|
|
typename DerivedJ>
|
|
IGL_INLINE bool mesh_boolean(
|
|
const std::vector<DerivedV > & Vlist,
|
|
const std::vector<DerivedF > & Flist,
|
|
const MeshBooleanType & type,
|
|
Eigen::PlainObjectBase<DerivedVC > & VC,
|
|
Eigen::PlainObjectBase<DerivedFC > & FC,
|
|
Eigen::PlainObjectBase<DerivedJ > & J);
|
|
/// \overload
|
|
/// \brief Given a merged mesh (V,F) and list of sizes of inputs
|
|
///
|
|
/// @param[in] V #V by 3 list of merged mesh vertex positions
|
|
/// @param[in] F #F by 3 list of merged mesh face indices so that first sizes(0)
|
|
/// faces come from the first input, and the next sizes(1) faces come
|
|
/// from the second input, and so on.
|
|
/// @param[in] sizes #inputs list of sizes so that sizes(i) is the #faces in the
|
|
/// ith input
|
|
template <
|
|
typename DerivedVV,
|
|
typename DerivedFF,
|
|
typename Derivedsizes,
|
|
typename DerivedVC,
|
|
typename DerivedFC,
|
|
typename DerivedJ>
|
|
IGL_INLINE bool mesh_boolean(
|
|
const Eigen::MatrixBase<DerivedVV > & VV,
|
|
const Eigen::MatrixBase<DerivedFF > & FF,
|
|
const Eigen::MatrixBase<Derivedsizes> & sizes,
|
|
const std::function<int(const Eigen::Matrix<int,1,Eigen::Dynamic>) >& wind_num_op,
|
|
const std::function<int(const int, const int)> & keep,
|
|
Eigen::PlainObjectBase<DerivedVC > & VC,
|
|
Eigen::PlainObjectBase<DerivedFC > & FC,
|
|
Eigen::PlainObjectBase<DerivedJ > & J);
|
|
/// \overload
|
|
template <
|
|
typename DerivedVA,
|
|
typename DerivedFA,
|
|
typename DerivedVB,
|
|
typename DerivedFB,
|
|
typename DerivedVC,
|
|
typename DerivedFC>
|
|
IGL_INLINE bool mesh_boolean(
|
|
const Eigen::MatrixBase<DerivedVA > & VA,
|
|
const Eigen::MatrixBase<DerivedFA > & FA,
|
|
const Eigen::MatrixBase<DerivedVB > & VB,
|
|
const Eigen::MatrixBase<DerivedFB > & FB,
|
|
const MeshBooleanType & type,
|
|
Eigen::PlainObjectBase<DerivedVC > & VC,
|
|
Eigen::PlainObjectBase<DerivedFC > & FC);
|
|
}
|
|
}
|
|
}
|
|
|
|
#ifndef IGL_STATIC_LIBRARY
|
|
# include "mesh_boolean.cpp"
|
|
#endif
|
|
|
|
#endif
|