mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 20:03:47 +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
committed by
SoftFever
SoftFever
parent
797ee70b0b
commit
807520ca1d
@@ -9,49 +9,54 @@
|
||||
#define SLIM_H
|
||||
|
||||
#include "igl_inline.h"
|
||||
#include "MappingEnergyType.h"
|
||||
#include <Eigen/Dense>
|
||||
#include <Eigen/Sparse>
|
||||
|
||||
// This option makes the iterations faster (all except the first) by caching the
|
||||
// sparsity pattern of the matrix involved in the assembly. It should be on if you plan to do many iterations, off if you have to change the matrix structure at every iteration.
|
||||
// This option makes the iterations faster (all except the first) by caching the
|
||||
// sparsity pattern of the matrix involved in the assembly. It should be on if
|
||||
// you plan to do many iterations, off if you have to change the matrix
|
||||
// structure at every iteration.
|
||||
#define SLIM_CACHED
|
||||
|
||||
#ifdef SLIM_CACHED
|
||||
#include <igl/AtA_cached.h>
|
||||
#include "AtA_cached.h"
|
||||
#endif
|
||||
|
||||
namespace igl
|
||||
{
|
||||
|
||||
// Compute a SLIM map as derived in "Scalable Locally Injective Maps" [Rabinovich et al. 2016].
|
||||
/// Parameters and precomputed data for computing a SLIM map as derived in
|
||||
/// "Scalable Locally Injective Maps" [Rabinovich et al. 2016].
|
||||
///
|
||||
/// \fileinfo
|
||||
struct SLIMData
|
||||
{
|
||||
// Input
|
||||
Eigen::MatrixXd V; // #V by 3 list of mesh vertex positions
|
||||
Eigen::MatrixXi F; // #F by 3/3 list of mesh faces (triangles/tets)
|
||||
enum SLIM_ENERGY
|
||||
{
|
||||
ARAP,
|
||||
LOG_ARAP,
|
||||
SYMMETRIC_DIRICHLET,
|
||||
CONFORMAL,
|
||||
EXP_CONFORMAL,
|
||||
EXP_SYMMETRIC_DIRICHLET
|
||||
};
|
||||
SLIM_ENERGY slim_energy;
|
||||
/// #V by 3 list of mesh vertex positions
|
||||
Eigen::MatrixXd V;
|
||||
/// #F by 3/4 list of mesh faces (triangles/tets)
|
||||
Eigen::MatrixXi F;
|
||||
/// Mapping energy type
|
||||
MappingEnergyType slim_energy;
|
||||
|
||||
// Optional Input
|
||||
// soft constraints
|
||||
/// Fixed indices
|
||||
Eigen::VectorXi b;
|
||||
/// Fixed values
|
||||
Eigen::MatrixXd bc;
|
||||
/// Weight for enforcing fixed values as soft constraint
|
||||
double soft_const_p;
|
||||
|
||||
double exp_factor; // used for exponential energies, ignored otherwise
|
||||
bool mesh_improvement_3d; // only supported for 3d
|
||||
/// used for exponential energies, ignored otherwise
|
||||
double exp_factor;
|
||||
/// only supported for 3d
|
||||
bool mesh_improvement_3d;
|
||||
|
||||
// Output
|
||||
Eigen::MatrixXd V_o; // #V by dim list of mesh vertex positions (dim = 2 for parametrization, 3 otherwise)
|
||||
double energy; // objective value
|
||||
/// #V by dim list of mesh vertex positions (dim = 2 for parametrization, 3 otherwise)
|
||||
Eigen::MatrixXd V_o;
|
||||
/// objective value
|
||||
double energy;
|
||||
|
||||
// INTERNAL
|
||||
Eigen::VectorXd M;
|
||||
@@ -64,9 +69,7 @@ struct SLIMData
|
||||
Eigen::VectorXd WGL_M;
|
||||
Eigen::VectorXd rhs;
|
||||
Eigen::MatrixXd Ri,Ji;
|
||||
Eigen::VectorXd W_11; Eigen::VectorXd W_12; Eigen::VectorXd W_13;
|
||||
Eigen::VectorXd W_21; Eigen::VectorXd W_22; Eigen::VectorXd W_23;
|
||||
Eigen::VectorXd W_31; Eigen::VectorXd W_32; Eigen::VectorXd W_33;
|
||||
Eigen::MatrixXd W;
|
||||
Eigen::SparseMatrix<double> Dx,Dy,Dz;
|
||||
int f_n,v_n;
|
||||
bool first_solve;
|
||||
@@ -81,33 +84,72 @@ struct SLIMData
|
||||
#endif
|
||||
};
|
||||
|
||||
// Compute necessary information to start using SLIM
|
||||
// Inputs:
|
||||
// V #V by 3 list of mesh vertex positions
|
||||
// F #F by 3/3 list of mesh faces (triangles/tets)
|
||||
// b list of boundary indices into V
|
||||
// bc #b by dim list of boundary conditions
|
||||
// soft_p Soft penalty factor (can be zero)
|
||||
// slim_energy Energy to minimize
|
||||
/// Compute necessary information to start using SLIM
|
||||
///
|
||||
/// @param[in] V #V by 3 list of mesh vertex positions
|
||||
/// @param[in] F #F by (3|4) list of mesh faces (triangles/tets)
|
||||
/// @param[in] V_init #V by 3 list of initial mesh vertex positions
|
||||
/// @param[in,out] data Precomputation data structure
|
||||
/// @param[in] slim_energy Energy to minimize
|
||||
/// @param[in] b list of boundary indices into V
|
||||
/// @param[in] bc #b by dim list of boundary conditions
|
||||
/// @param[in] soft_p Soft penalty factor (can be zero)
|
||||
///
|
||||
/// \fileinfo
|
||||
IGL_INLINE void slim_precompute(
|
||||
const Eigen::MatrixXd& V,
|
||||
const Eigen::MatrixXi& F,
|
||||
const Eigen::MatrixXd& V_init,
|
||||
SLIMData& data,
|
||||
SLIMData::SLIM_ENERGY slim_energy,
|
||||
Eigen::VectorXi& b,
|
||||
Eigen::MatrixXd& bc,
|
||||
MappingEnergyType slim_energy,
|
||||
const Eigen::VectorXi& b,
|
||||
const Eigen::MatrixXd& bc,
|
||||
double soft_p);
|
||||
|
||||
// Run iter_num iterations of SLIM
|
||||
// Outputs:
|
||||
// V_o (in SLIMData): #V by dim list of mesh vertex positions
|
||||
IGL_INLINE Eigen::MatrixXd slim_solve(SLIMData& data, int iter_num);
|
||||
/// Run iter_num iterations of SLIM
|
||||
///
|
||||
/// @param[in,out] data Precomputation data structure
|
||||
/// @param[in] iter_num Number of iterations to run
|
||||
/// @return #V by dim list of mesh vertex positions
|
||||
///
|
||||
/// \fileinfo
|
||||
IGL_INLINE Eigen::MatrixXd slim_solve(
|
||||
SLIMData& data,
|
||||
int iter_num);
|
||||
|
||||
} // END NAMESPACE
|
||||
/// Internal Routine. Exposed for Integration with SCAF
|
||||
///
|
||||
/// @param[in] Ji ?? by ?? list of Jacobians??
|
||||
/// @param[in] slim_energy Energy to minimize
|
||||
/// @param[in] exp_factor ??? used for exponential energies, ignored otherwise
|
||||
/// @param[out] W ?? by ?? list of weights??
|
||||
/// @param[out] Ri ?? by ?? list of rotations??
|
||||
///
|
||||
/// \fileinfo
|
||||
IGL_INLINE void slim_update_weights_and_closest_rotations_with_jacobians(
|
||||
const Eigen::MatrixXd &Ji,
|
||||
igl::MappingEnergyType slim_energy,
|
||||
double exp_factor,
|
||||
Eigen::MatrixXd &W,
|
||||
Eigen::MatrixXd &Ri);
|
||||
|
||||
/// Undocumented function related to SLIM optimization
|
||||
///
|
||||
/// @param[in] Dx ?? by ?? matrix to compute of x derivatives?
|
||||
/// @param[in] Dy ?? by ?? matrix to compute of y derivatives?
|
||||
/// @param[in] Dz ?? bz ?? matrix to compute of z derivatives?
|
||||
/// @param[in] W ?? by ?? list of weights??
|
||||
/// @param[out] IJV ?? by ?? list of triplets to some A matrix??
|
||||
IGL_INLINE void slim_buildA(
|
||||
const Eigen::SparseMatrix<double> &Dx,
|
||||
const Eigen::SparseMatrix<double> &Dy,
|
||||
const Eigen::SparseMatrix<double> &Dz,
|
||||
const Eigen::MatrixXd &W,
|
||||
std::vector<Eigen::Triplet<double> > & IJV);
|
||||
}
|
||||
|
||||
#ifndef IGL_STATIC_LIBRARY
|
||||
# include "slim.cpp"
|
||||
#endif
|
||||
|
||||
#endif // SLIM_H
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user