juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
fix/x2d
OrcaSlicer/deps_src/libigl/igl/shapeup.h
Donovan Baarda 807520ca1d 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
* 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>
2026-05-12 20:35:21 +08:00

185 lines
7.4 KiB
C++
Raw Permalink Blame History

// This file is part of libigl, a simple c++ geometry processing library.
//
// Copyright (C) 2017 Amir Vaxman <avaxman@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_SHAPEUP_H
#define IGL_SHAPEUP_H
#include "min_quad_with_fixed.h"
#include "igl_inline.h"
#include "setdiff.h"
#include "cat.h"
#include <Eigen/Core>
#include <vector>
#include "PI.h"
//This file implements the following algorithm:
//Bouaziz et al.
//Shape-Up: Shaping Discrete Geometry with Projections
//Computer Graphics Forum (Proc. SGP) 31(5), 2012
namespace igl
{
/// Parameters and precomputed data for ShapeUp
///
/// \fileinfo
struct ShapeupData{
//input data
Eigen::MatrixXd P;
Eigen::VectorXi SC;
Eigen::MatrixXi S;
Eigen::VectorXi b;
int maxIterations; //referring to number of local-global pairs.
double pTolerance; //algorithm stops when max(|P_k-P_{k-1}|)<pTolerance.
double shapeCoeff, closeCoeff, smoothCoeff;
//Internally-used matrices
Eigen::SparseMatrix<double> DShape, DClose, DSmooth, Q, A, At, W;
min_quad_with_fixed_data<double> solver_data;
ShapeupData():
maxIterations(50),
pTolerance(10e-6),
shapeCoeff(1.0),
closeCoeff(100.0),
smoothCoeff(0.0){}
};
// Alec: I'm not sure why these are using PlainObjectBase but then not
// templating.
/// Every function here defines a local projection for ShapeUp, and must have
/// the following structure to qualify:
///
/// @param[in] P #P by 3 set of points, either the initial solution, or from
/// previous iteration.
/// @param[in] SC #Set by 1 cardinalities of sets in S
/// @param[in] S #Sets by max(SC) independent sets where the local projection
/// applies. Values beyond column SC(i)-1 in row S(i,:) are "don't care"
/// @param[out] projP #S by 3*max(SC) in format xyzxyzxyz, where the
/// projected points correspond to each set in S in the same order.
/// @return Return value appears to be ignored
///
/// \fileinfo
//typedef std::function<
// bool(
// const Eigen::MatrixBase<Eigen::MatrixXd>&,
// const Eigen::MatrixBase<Eigen::VectorXi>&,
// const Eigen::MatrixBase<Eigen::MatrixXi>&,
// Eigen::PlainObjectBase<Eigen::MatrixXd>&)>
// shapeup_projection_function;
using
shapeup_projection_function
=
std::function<
bool(
const Eigen::MatrixBase<Eigen::MatrixXd>&,
const Eigen::MatrixBase<Eigen::VectorXi>&,
const Eigen::MatrixBase<Eigen::MatrixXi>&,
Eigen::PlainObjectBase<Eigen::MatrixXd>&)> ;
/// This projection does nothing but render points into projP. Mostly used for
/// "echoing" the global step
///
/// @param[in] P #P by 3 set of points, either the initial solution, or from
/// previous iteration.
/// @param[in] SC #Set by 1 cardinalities of sets in S
/// @param[in] S #Sets by max(SC) independent sets where the local projection
/// applies. Values beyond column SC(i)-1 in row S(i,:) are "don't care"
/// @param[out] projP #S by 3*max(SC) in format xyzxyzxyz, where the
/// projected points correspond to each set in S in the same order.
/// @return Return value appears to be ignored
///
/// \fileinfo
IGL_INLINE bool shapeup_identity_projection(
const Eigen::MatrixBase<Eigen::MatrixXd>& P,
const Eigen::MatrixBase<Eigen::VectorXi>& SC,
const Eigen::MatrixBase<Eigen::MatrixXi>& S,
Eigen::PlainObjectBase<Eigen::MatrixXd>& projP);
/// the projection assumes that the sets are vertices of polygons in cyclic
/// order
///
/// @param[in] P #P by 3 set of points, either the initial solution, or from
/// previous iteration.
/// @param[in] SC #Set by 1 cardinalities of sets in S
/// @param[in] S #Sets by max(SC) independent sets where the local projection
/// applies. Values beyond column SC(i)-1 in row S(i,:) are "don't care"
/// @param[out] projP #S by 3*max(SC) in format xyzxyzxyz, where the
/// projected points correspond to each set in S in the same order.
/// @return Return value appears to be ignored
///
/// \fileinfo
IGL_INLINE bool shapeup_regular_face_projection(
const Eigen::MatrixBase<Eigen::MatrixXd>& P,
const Eigen::MatrixBase<Eigen::VectorXi>& SC,
const Eigen::MatrixBase<Eigen::MatrixXi>& S,
Eigen::PlainObjectBase<Eigen::MatrixXd>& projP);
/// This function precomputation the necessary matrices for the ShapeUp
/// process, and prefactorizes them.
///
/// @param[in] P #P by 3 point positions
/// @param[in] SC #Set by 1 cardinalities of sets in S
/// @param[in] S #Sets by max(SC) independent sets where the local projection
/// applies. Values beyond column SC(i)-1 in row S(i,:) are "don't care"
/// @param[in] E #E by 2 the "edges" of the set P; used for the smoothness
/// energy.
/// @param[in] b #b by 1 boundary (fixed) vertices from P.
/// @param[in] wShape #Set by 1
/// @param[in] wSmooth #b by 1 weights for constraints from S and positional
/// constraints (used in the global step)
/// @param[out] sudata struct ShapeupData the data necessary to solve the
/// system in shapeup_solve
/// @return true if precomputation was successful, false otherwise
///
/// \fileinfo
template <
typename DerivedP,
typename DerivedSC,
typename DerivedS,
typename Derivedw>
IGL_INLINE bool shapeup_precomputation(
const Eigen::MatrixBase<DerivedP>& P,
const Eigen::MatrixBase<DerivedSC>& SC,
const Eigen::MatrixBase<DerivedS>& S,
const Eigen::MatrixBase<DerivedS>& E,
const Eigen::MatrixBase<DerivedSC>& b,
const Eigen::MatrixBase<Derivedw>& wShape,
const Eigen::MatrixBase<Derivedw>& wSmooth,
ShapeupData & sudata);
/// This function solve the shapeup project optimization. shapeup_precompute
/// must be called before with the same sudata, or results are unpredictable
///
/// @param[in] bc #b by 3 fixed point values corresonding to "b" in sudata
/// @param[in] local_projection function pointer taking (P,SC,S,projP),
/// where the first three parameters are as defined, and "projP" is the output, as a #S by 3*max(SC) function in format xyzxyzxyz, and where it returns the projected points corresponding to each set in S in the same order.
/// NOTE: the input values in P0 don't need to correspond to prescribed values in bc; the iterations will project them automatically (by design).
/// @param[in] P0 #P by 3 initial solution (point positions)
/// @param[in] sudata the ShapeUpData structure computed in shapeup_precomputation()
/// @param[in] quietIterations flagging if to output iteration information.
/// @param[out] P the solution to the problem, indices corresponding to P0.
/// @returns true if the solver converged, false otherwise.
///
/// \fileinfo
template <
typename DerivedP,
typename DerivedSC,
typename DerivedS>
IGL_INLINE bool shapeup_solve(
const Eigen::MatrixBase<DerivedP>& bc,
const std::function<bool(const Eigen::MatrixBase<DerivedP>&, const Eigen::MatrixBase<DerivedSC>&, const Eigen::MatrixBase<DerivedS>&, Eigen::PlainObjectBase<DerivedP>&)>& local_projection,
const Eigen::MatrixBase<DerivedP>& P0,
const ShapeupData & sudata,
const bool quietIterations,
Eigen::PlainObjectBase<DerivedP>& P);
}
#ifndef IGL_STATIC_LIBRARY
#include "shapeup.cpp"
#endif
#endif
Reference in New Issue View Git Blame Copy Permalink