juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update eigen to v5.0.1 and libigl to v2.6.0. (#11311)

Browse Source 
* 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
* e3c277b9ee

For 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
2026-05-12 17:09:13 +10:00
committed by SoftFever
parent 797ee70b0b
commit 807520ca1d
1573 changed files with 63323 additions and 161343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
deps_src/libigl/igl/matlab/MatlabWorkspace.h
View File

@@ -20,130 +20,132 @@ namespace igl
{
namespace matlab
{
// It would be really great to replicate this for a simple XML-based
// workspace.
//
// Class which contains data of a matlab workspace which can be written to a
// .mat file and loaded from matlab
//
// This depends on matlab at compile time (though it shouldn't necessarily
// have to) but it does not depend on running the matlab engine at run-time.
//
// Known bugs: Treats all matrices as doubles (this may actually be desired
// for some "index" matrices since matlab's sparse command takes doubles
// rather than int class matrices). It is of course not desired when dealing
// with logicals or uint's for images.
/// Class which contains data of a matlab workspace which can be written to a
/// .mat file and loaded from matlab
///
/// This depends on matlab at compile time (though it shouldn't necessarily
/// have to) but it does not depend on running the matlab engine at run-time.
///
/// \bug Treats all matrices as doubles (this may actually be desired
/// for some "index" matrices since matlab's sparse command takes doubles
/// rather than int class matrices). It is of course not desired when dealing
/// with logicals or uint's for images.
///
class MatlabWorkspace
{
private:
// KNOWN BUG: Why not use a map? Any reason to allow duplicate names?
//
// List of names
/// List of names
/// \bug Why not use a map? Any reason to allow duplicate names?
std::vector<std::string> names;
// List of data pointers
/// List of data pointers
std::vector<mxArray*> data;
public:
MatlabWorkspace();
~MatlabWorkspace();
// Clear names and data of variables in workspace
/// Clear names and data of variables in workspace
inline void clear();
// Save current list of variables
//
// Inputs:
// path path to .mat file
// Returns true on success, false on failure
/// Save current list of variables
///
/// @param[in] path path to .mat file
/// @return true on success, false on failure
inline bool write(const std::string & path) const;
// Load list of variables from .mat file
//
// Inputs:
// path path to .mat file
// Returns true on success, false on failure
/// Load list of variables from .mat file
///
/// @param[in] path path to .mat file
/// @return true on success, false on failure
inline bool read(const std::string & path);
// Assign data to a variable name in the workspace
//
// Template:
// DerivedM eigen matrix (e.g. MatrixXd)
// Inputs:
// M data (usually a matrix)
// name variable name to save into work space
// Returns true on success, false on failure
//
// Known Bugs: Assumes Eigen is using column major ordering
/// Assign data to a variable name in the workspace
///
/// @tparam DerivedM eigen matrix (e.g. MatrixXd)
/// @param[in] M data (usually a matrix)
/// @param[in] name variable name to save into work space
/// @return true on success, false on failure
///
/// \bug Assumes DerivedM is using column major ordering
template <typename DerivedM>
inline MatlabWorkspace& save(
const Eigen::PlainObjectBase<DerivedM>& M,
const Eigen::MatrixBase<DerivedM>& M,
const std::string & name);
// Template:
// MT sparse matrix type (e.g. double)
/// \overload
/// @tparam MT sparse matrix type (e.g. double)
template <typename MT>
inline MatlabWorkspace& save(
const Eigen::SparseMatrix<MT>& M,
const std::string & name);
// Templates:
// ScalarM scalar type, e.g. double
/// \overload
/// @tparam ScalarM scalar type, e.g. double
template <typename ScalarM>
inline MatlabWorkspace& save(
const std::vector<std::vector<ScalarM> > & vM,
const std::string & name);
// Templates:
// ScalarV scalar type, e.g. double
/// \overload
/// @tparam ScalarV scalar type, e.g. double
template <typename ScalarV>
inline MatlabWorkspace& save(
const std::vector<ScalarV> & vV,
const std::string & name);
// NOTE: Eigen stores quaternions coefficients as (i,j,k,1), but most of
// our matlab code stores them as (1,i,j,k) This takes a quaternion and
// saves it as a (1,i,j,k) row vector
//
// Templates:
// Q quaternion type
/// @tparam Q quaternion type
///
/// NOTE: Eigen stores quaternions coefficients as (i,j,k,1), but most of
/// our matlab code stores them as (1,i,j,k) This takes a quaternion and
/// saves it as a (1,i,j,k) row vector
template <typename Q>
inline MatlabWorkspace& save(
const Eigen::Quaternion<Q> & q,
const std::string & name);
/// \overload
inline MatlabWorkspace& save(
const double d,
const std::string & name);
// Same as save() but adds 1 to each element, useful for saving "index"
// matrices like lists of faces or elements
/// Same as save() but adds 1 to each element, useful for saving "index"
/// matrices like lists of faces or elements
/// @tparam DerivedM eigen matrix (e.g. MatrixXd)
template <typename DerivedM>
inline MatlabWorkspace& save_index(
const Eigen::DenseBase<DerivedM>& M,
const std::string & name);
/// \overload
/// @tparam MT sparse matrix type (e.g. double)
template <typename ScalarM>
inline MatlabWorkspace& save_index(
const std::vector<std::vector<ScalarM> > & vM,
const std::string & name);
/// \overload
/// @tparam ScalarV scalar type, e.g. double
template <typename ScalarV>
inline MatlabWorkspace& save_index(
const std::vector<ScalarV> & vV,
const std::string & name);
// Find a certain matrix by name.
//
// KNOWN BUG: Outputs the first found (not necessarily unique lists).
//
// Template:
// DerivedM eigen matrix (e.g. MatrixXd)
// Inputs:
// name exact name of matrix as string
// Outputs:
// M matrix
// Returns true only if found.
/// Find a certain matrix by name.
///
/// \bug Outputs the first found (not necessarily unique lists).
///
/// @tparam DerivedM eigen matrix (e.g. MatrixXd)
/// @param[in] name exact name of matrix as string
/// @param[out] M matrix
/// @return true only if found.
template <typename DerivedM>
inline bool find(
const std::string & name,
Eigen::PlainObjectBase<DerivedM>& M);
/// \overload
/// @tparam MT sparse matrix type (e.g. double)
template <typename MT>
inline bool find(
const std::string & name,
Eigen::SparseMatrix<MT>& M);
/// \overload
inline bool find(
const std::string & name,
double & d);
/// \overload
inline bool find(
const std::string & name,
int & v);
// Subtracts 1 from all entries
/// Subtracts 1 from all entries
/// @tparam DerivedM eigen matrix (e.g. MatrixXd)
/// @param[in] name exact name of matrix as string
/// @param[out] M matrix
template <typename DerivedM>
inline bool find_index(
const std::string & name,
@@ -288,7 +290,7 @@ inline bool igl::matlab::MatlabWorkspace::read(const std::string & path)
// Treat everything as a double
template <typename DerivedM>
inline igl::matlab::MatlabWorkspace& igl::matlab::MatlabWorkspace::save(
const Eigen::PlainObjectBase<DerivedM>& M,
const Eigen::MatrixBase<DerivedM>& M,
const std::string & name)
{
using namespace std;