mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-21 04:13:50 +00:00
Update eigen to v5.0.1 and libigl to v2.6.0. (#11311)
* 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>
This commit is contained in:
Donovan Baarda
@@ -11,38 +11,45 @@
|
||||
#include "igl_inline.h"
|
||||
#include "AABB.h"
|
||||
#include "WindingNumberAABB.h"
|
||||
#include "fast_winding_number.h"
|
||||
#include <Eigen/Core>
|
||||
#include <vector>
|
||||
namespace igl
|
||||
{
|
||||
/// Types of signing a distance field
|
||||
enum SignedDistanceType
|
||||
{
|
||||
// Use fast pseudo-normal test [Bærentzen & Aanæs 2005]
|
||||
SIGNED_DISTANCE_TYPE_PSEUDONORMAL = 0,
|
||||
SIGNED_DISTANCE_TYPE_WINDING_NUMBER = 1,
|
||||
SIGNED_DISTANCE_TYPE_DEFAULT = 2,
|
||||
SIGNED_DISTANCE_TYPE_UNSIGNED = 3,
|
||||
NUM_SIGNED_DISTANCE_TYPE = 4
|
||||
/// Use fast pseudo-normal test [Bærentzen & Aanæs 2005]
|
||||
SIGNED_DISTANCE_TYPE_PSEUDONORMAL = 0,
|
||||
/// Use winding number [Jacobson, Kavan Sorking-Hornug 2013]
|
||||
SIGNED_DISTANCE_TYPE_WINDING_NUMBER = 1,
|
||||
/// Default
|
||||
SIGNED_DISTANCE_TYPE_DEFAULT = 2,
|
||||
/// Unsigned (absolute value)
|
||||
SIGNED_DISTANCE_TYPE_UNSIGNED = 3,
|
||||
/// Use Fast winding number [Barill, Dickson, Schmidt, Levin, Jacobson 2018]
|
||||
SIGNED_DISTANCE_TYPE_FAST_WINDING_NUMBER = 4,
|
||||
/// Total number of signed distance types
|
||||
NUM_SIGNED_DISTANCE_TYPE = 5
|
||||
};
|
||||
// Computes signed distance to a mesh
|
||||
//
|
||||
// Inputs:
|
||||
// P #P by 3 list of query point positions
|
||||
// V #V by 3 list of vertex positions
|
||||
// F #F by ss list of triangle indices, ss should be 3 unless sign_type ==
|
||||
// SIGNED_DISTANCE_TYPE_UNSIGNED
|
||||
// sign_type method for computing distance _sign_ S
|
||||
// lower_bound lower bound of distances needed {std::numeric_limits::min}
|
||||
// upper_bound lower bound of distances needed {std::numeric_limits::max}
|
||||
// Outputs:
|
||||
// S #P list of smallest signed distances
|
||||
// I #P list of facet indices corresponding to smallest distances
|
||||
// C #P by 3 list of closest points
|
||||
// N #P by 3 list of closest normals (only set if
|
||||
// sign_type=SIGNED_DISTANCE_TYPE_PSEUDONORMAL)
|
||||
//
|
||||
// Known bugs: This only computes distances to triangles. So unreferenced
|
||||
// vertices and degenerate triangles are ignored.
|
||||
/// Computes signed distance to a mesh
|
||||
///
|
||||
/// @param[in] P #P by (2|3) list of query point positions
|
||||
/// @param[in] V #V by (2|3) list of vertex positions
|
||||
/// @param[in] F #F by ss list of triangle indices, ss should be 3 unless
|
||||
/// sign_type == SIGNED_DISTANCE_TYPE_UNSIGNED |
|
||||
/// SIGNED_DISTANCE_TYPE_WINDING_NUMBER
|
||||
/// @param[in] sign_type method for computing distance _sign_ S
|
||||
/// @param[in] lower_bound lower bound of distances needed {std::numeric_limits::min}
|
||||
/// @param[in] upper_bound lower bound of distances needed {std::numeric_limits::max}
|
||||
/// @param[out] S #P list of smallest signed distances
|
||||
/// @param[out] I #P list of facet indices corresponding to smallest distances
|
||||
/// @param[out] C #P by (2|3) list of closest points
|
||||
/// @param[out] N #P by (2|3) list of closest normals (only set if
|
||||
/// sign_type=SIGNED_DISTANCE_TYPE_PSEUDONORMAL)
|
||||
///
|
||||
/// \bug This only computes distances to triangles. So unreferenced
|
||||
/// vertices and degenerate triangles are ignored.
|
||||
template <
|
||||
typename DerivedP,
|
||||
typename DerivedV,
|
||||
@@ -62,7 +69,7 @@ namespace igl
|
||||
Eigen::PlainObjectBase<DerivedI> & I,
|
||||
Eigen::PlainObjectBase<DerivedC> & C,
|
||||
Eigen::PlainObjectBase<DerivedN> & N);
|
||||
// Default bounds
|
||||
/// \overload
|
||||
template <
|
||||
typename DerivedP,
|
||||
typename DerivedV,
|
||||
@@ -80,18 +87,19 @@ namespace igl
|
||||
Eigen::PlainObjectBase<DerivedI> & I,
|
||||
Eigen::PlainObjectBase<DerivedC> & C,
|
||||
Eigen::PlainObjectBase<DerivedN> & N);
|
||||
// Computes signed distance to mesh
|
||||
//
|
||||
// Inputs:
|
||||
// tree AABB acceleration tree (see AABB.h)
|
||||
// F #F by 3 list of triangle indices
|
||||
// FN #F by 3 list of triangle normals
|
||||
// VN #V by 3 list of vertex normals (ANGLE WEIGHTING)
|
||||
// EN #E by 3 list of edge normals (UNIFORM WEIGHTING)
|
||||
// EMAP #F*3 mapping edges in F to E
|
||||
// q Query point
|
||||
// Returns signed distance to mesh
|
||||
//
|
||||
/// Computes signed distance to mesh using pseudonormal with precomputed AABB
|
||||
/// tree and edge/vertice normals
|
||||
///
|
||||
/// @param[in] tree AABB acceleration tree (see AABB.h)
|
||||
/// @param[in] F #F by 3 list of triangle indices
|
||||
/// @param[in] FN #F by 3 list of triangle normals
|
||||
/// @param[in] VN #V by 3 list of vertex normals (ANGLE WEIGHTING)
|
||||
/// @param[in] EN #E by 3 list of edge normals (UNIFORM WEIGHTING)
|
||||
/// @param[in] EMAP #F*3 mapping edges in F to E
|
||||
/// @param[in] q Query point
|
||||
/// @return signed distance to mesh
|
||||
///
|
||||
/// \fileinfo
|
||||
template <
|
||||
typename DerivedV,
|
||||
typename DerivedF,
|
||||
@@ -109,6 +117,9 @@ namespace igl
|
||||
const Eigen::MatrixBase<DerivedEN> & EN,
|
||||
const Eigen::MatrixBase<DerivedEMAP> & EMAP,
|
||||
const Eigen::MatrixBase<Derivedq> & q);
|
||||
/// \overload
|
||||
///
|
||||
/// \fileinfo
|
||||
template <
|
||||
typename DerivedP,
|
||||
typename DerivedV,
|
||||
@@ -134,12 +145,15 @@ namespace igl
|
||||
Eigen::PlainObjectBase<DerivedI> & I,
|
||||
Eigen::PlainObjectBase<DerivedC> & C,
|
||||
Eigen::PlainObjectBase<DerivedN> & N);
|
||||
// Outputs:
|
||||
// s sign
|
||||
// sqrd squared distance
|
||||
// i closest primitive
|
||||
// c closest point
|
||||
// n normal
|
||||
/// \overload
|
||||
///
|
||||
/// @param[out] s sign
|
||||
/// @param[out] sqrd squared distance
|
||||
/// @param[out] i closest primitive
|
||||
/// @param[out] c closest point
|
||||
/// @param[out] n normal
|
||||
///
|
||||
/// \fileinfo
|
||||
template <
|
||||
typename DerivedV,
|
||||
typename DerivedF,
|
||||
@@ -165,6 +179,7 @@ namespace igl
|
||||
int & i,
|
||||
Eigen::PlainObjectBase<Derivedc> & c,
|
||||
Eigen::PlainObjectBase<Derivedn> & n);
|
||||
/// \overload
|
||||
template <
|
||||
typename DerivedV,
|
||||
typename DerivedE,
|
||||
@@ -186,11 +201,14 @@ namespace igl
|
||||
int & i,
|
||||
Eigen::PlainObjectBase<Derivedc> & c,
|
||||
Eigen::PlainObjectBase<Derivedn> & n);
|
||||
// Inputs:
|
||||
// tree AABB acceleration tree (see cgal/point_mesh_squared_distance.h)
|
||||
// hier Winding number evaluation hierarchy
|
||||
// q Query point
|
||||
// Returns signed distance to mesh
|
||||
/// Computes signed distance to mesh using winding number with precomputed AABB
|
||||
///
|
||||
/// @param[in] tree AABB acceleration tree (see cgal/point_mesh_squared_distance.h)
|
||||
/// @param[in] hier Winding number evaluation hierarchy
|
||||
/// @param[in] q Query point
|
||||
/// @return signed distance to mesh
|
||||
///
|
||||
/// \fileinfo
|
||||
template <
|
||||
typename DerivedV,
|
||||
typename DerivedF,
|
||||
@@ -199,12 +217,13 @@ namespace igl
|
||||
const AABB<DerivedV,3> & tree,
|
||||
const Eigen::MatrixBase<DerivedV> & V,
|
||||
const Eigen::MatrixBase<DerivedF> & F,
|
||||
const igl::WindingNumberAABB<Derivedq,DerivedV,DerivedF> & hier,
|
||||
const igl::WindingNumberAABB<typename DerivedV::Scalar,typename DerivedF::Scalar> & hier,
|
||||
const Eigen::MatrixBase<Derivedq> & q);
|
||||
// Outputs:
|
||||
// s sign
|
||||
// sqrd squared distance
|
||||
// pp closest point and primitve
|
||||
/// \overload
|
||||
/// @param[out] s sign
|
||||
/// @param[out] sqrd squared distance
|
||||
/// @param[out] pp closest point and primitve
|
||||
/// \fileinfo
|
||||
template <
|
||||
typename DerivedV,
|
||||
typename DerivedF,
|
||||
@@ -215,12 +234,13 @@ namespace igl
|
||||
const AABB<DerivedV,3> & tree,
|
||||
const Eigen::MatrixBase<DerivedV> & V,
|
||||
const Eigen::MatrixBase<DerivedF> & F,
|
||||
const igl::WindingNumberAABB<Derivedq,DerivedV,DerivedF> & hier,
|
||||
const igl::WindingNumberAABB<typename DerivedV::Scalar,typename DerivedF::Scalar> & hier,
|
||||
const Eigen::MatrixBase<Derivedq> & q,
|
||||
Scalar & s,
|
||||
Scalar & sqrd,
|
||||
int & i,
|
||||
Eigen::PlainObjectBase<Derivedc> & c);
|
||||
/// \overload
|
||||
template <
|
||||
typename DerivedV,
|
||||
typename DerivedF,
|
||||
@@ -236,6 +256,60 @@ namespace igl
|
||||
Scalar & sqrd,
|
||||
int & i,
|
||||
Eigen::PlainObjectBase<Derivedc> & c);
|
||||
/// Calculates signed distance at query points P, using fast winding number
|
||||
/// for sign.
|
||||
///
|
||||
/// #### Usage:
|
||||
/// VectorXd S;
|
||||
/// VectorXd V, P; //where V is mesh vertices, P are query points
|
||||
/// VectorXi F;
|
||||
/// igl::FastWindingNumberBVH fwn_bvh;
|
||||
/// igl::fast_winding_number(V.cast<float>(), F, 2, fwn_bvh);
|
||||
/// igl::signed_distance_fast_winding_number(P,V,F,tree,fwn_bvh,S);
|
||||
///
|
||||
/// @param[in] P #P by 3 list of query point positions
|
||||
/// @param[in] V #V by 3 list of triangle indices
|
||||
/// @param[in] F #F by 3 list of triangle normals
|
||||
/// @param[in] tree AABB acceleration tree (see AABB.h)
|
||||
/// @param[in] bvh fast winding precomputation (see Fast_Winding_Number.h)
|
||||
/// @param[out] S #P list of signed distances of each point in P
|
||||
///
|
||||
/// \fileinfo
|
||||
template <
|
||||
typename DerivedP,
|
||||
typename DerivedV,
|
||||
typename DerivedF,
|
||||
typename DerivedS>
|
||||
IGL_INLINE void signed_distance_fast_winding_number(
|
||||
const Eigen::MatrixBase<DerivedP> & P,
|
||||
const Eigen::MatrixBase<DerivedV> & V,
|
||||
const Eigen::MatrixBase<DerivedF> & F,
|
||||
const AABB<DerivedV,3> & tree,
|
||||
const igl::FastWindingNumberBVH & fwn_bvh,
|
||||
Eigen::PlainObjectBase<DerivedS> & S
|
||||
);
|
||||
/// Calculates signed distance at query point q, using fast winding number for
|
||||
/// sign.
|
||||
///
|
||||
/// @param[in] tree AABB acceleration tree (see AABB.h)
|
||||
/// @param[in] V #V by 3 list of triangle indices
|
||||
/// @param[in] F #F by 3 list of triangle normals
|
||||
/// @param[in] bvh fast winding precomputation (see Fast_Winding_Number.h)
|
||||
/// @param[in] q 1 by 3 list of query point positions
|
||||
/// @param[out] S #P list of signed distances of each point in P
|
||||
///
|
||||
/// \fileinfo
|
||||
template <
|
||||
typename Derivedq,
|
||||
typename DerivedV,
|
||||
typename DerivedF>
|
||||
IGL_INLINE typename DerivedV::Scalar signed_distance_fast_winding_number(
|
||||
const Eigen::MatrixBase<Derivedq> & q,
|
||||
const Eigen::MatrixBase<DerivedV> & V,
|
||||
const Eigen::MatrixBase<DerivedF> & F,
|
||||
const AABB<DerivedV,3> & tree,
|
||||
const igl::FastWindingNumberBVH & fwn_bvh
|
||||
);
|
||||
}
|
||||
|
||||
#ifndef IGL_STATIC_LIBRARY
|
||||
|
||||
Reference in New Issue
Block a user