mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 09:02:06 +00:00
* 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>
247 lines
9.2 KiB
C++
247 lines
9.2 KiB
C++
// This file is part of libigl, a simple c++ geometry processing library.
|
|
//
|
|
// Copyright (C) 2013 Alec Jacobson <alecjacobson@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
|
|
|
|
#include "kelvinlets.h"
|
|
#include "PI.h"
|
|
#include "parallel_for.h"
|
|
|
|
namespace igl {
|
|
|
|
// Performs the deformation of a single point based on the regularized
|
|
// kelvinlets
|
|
//
|
|
// Inputs:
|
|
// dt delta time used to calculate brush tip displacement
|
|
// x dim-vector of point to be deformed
|
|
// x0 dim-vector of brush tip
|
|
// f dim-vector of brush force (translation)
|
|
// F dim by dim matrix of brush force matrix (linear)
|
|
// kp parameters for the kelvinlet brush like brush radius, scale etc
|
|
// Returns:
|
|
// X dim-vector of the new point x gets displaced to post deformation
|
|
template<typename Derivedx,
|
|
typename Derivedx0,
|
|
typename Derivedf,
|
|
typename DerivedF,
|
|
typename Scalar>
|
|
IGL_INLINE auto kelvinlet_evaluator(const Scalar dt,
|
|
const Eigen::MatrixBase<Derivedx>& x,
|
|
const Eigen::MatrixBase<Derivedx0>& x0,
|
|
const Eigen::MatrixBase<Derivedf>& f,
|
|
const Eigen::MatrixBase<DerivedF>& F,
|
|
const igl::KelvinletParams<Scalar>& kp)
|
|
-> Eigen::Matrix<Scalar, 3, 1>
|
|
{
|
|
static constexpr double POISSON_RATIO = 0.5;
|
|
static constexpr double SHEAR_MODULUS = 1;
|
|
static constexpr double a = 1 / (4 * igl::PI * SHEAR_MODULUS);
|
|
static constexpr double b = a / (4 * (1 - POISSON_RATIO));
|
|
static constexpr double c = 2 / (3 * a - 2 * b);
|
|
|
|
const auto linearVelocity = f / c / kp.epsilon;
|
|
|
|
const auto originAdjusted = x0 + linearVelocity * dt;
|
|
const auto r = x - originAdjusted;
|
|
const auto r_norm_sq = r.squaredNorm();
|
|
|
|
std::function<Eigen::Matrix<Scalar, 3, 1>(const Scalar&)> kelvinlet;
|
|
|
|
switch (kp.brushType) {
|
|
case igl::BrushType::GRAB: {
|
|
// Regularized Kelvinlets: Formula (6)
|
|
kelvinlet = [&r, &f, &r_norm_sq](const Scalar& epsilon) {
|
|
const auto r_epsilon = sqrt(r_norm_sq + epsilon * epsilon);
|
|
const auto r_epsilon_3 = r_epsilon * r_epsilon * r_epsilon;
|
|
auto t1 = ((a - b) / r_epsilon) * f;
|
|
auto t2 = ((b / r_epsilon_3) * r * r.transpose()) * f;
|
|
auto t3 = ((a * epsilon * epsilon) / (2 * r_epsilon_3)) * f;
|
|
return t1 + t2 + t3;
|
|
};
|
|
break;
|
|
}
|
|
case igl::BrushType::TWIST: {
|
|
// Regularized Kelvinlets: Formula (15)
|
|
kelvinlet = [&r, &F, &r_norm_sq](const Scalar& epsilon) {
|
|
const auto r_epsilon = sqrt(r_norm_sq + epsilon * epsilon);
|
|
const auto r_epsilon_3 = r_epsilon * r_epsilon * r_epsilon;
|
|
return -a *
|
|
(1 / (r_epsilon_3) +
|
|
3 * epsilon * epsilon /
|
|
(2 * r_epsilon_3 * r_epsilon * r_epsilon)) *
|
|
F * r;
|
|
};
|
|
break;
|
|
}
|
|
case igl::BrushType::SCALE: {
|
|
// Regularized Kelvinlets: Formula (16)
|
|
kelvinlet = [&r, &F, &r_norm_sq](const Scalar& epsilon) {
|
|
static constexpr auto b_compressible = a / 4; // assumes poisson ratio 0
|
|
const auto r_epsilon = sqrt(r_norm_sq + epsilon * epsilon);
|
|
const auto r_epsilon_3 = r_epsilon * r_epsilon * r_epsilon;
|
|
auto coeff =
|
|
(2 * b_compressible - a) *
|
|
(1 / (r_epsilon_3) +
|
|
3 * (epsilon * epsilon) / (2 * r_epsilon_3 * r_epsilon * r_epsilon));
|
|
return coeff * F * r;
|
|
};
|
|
break;
|
|
}
|
|
case igl::BrushType::PINCH: {
|
|
// Regularized Kelvinlets: Formula (17)
|
|
kelvinlet = [&r, &F, &r_norm_sq, &kp](const Scalar& epsilon) {
|
|
const auto r_epsilon = sqrt(r_norm_sq + kp.epsilon * kp.epsilon);
|
|
const auto r_epsilon_3 = r_epsilon * r_epsilon * r_epsilon;
|
|
auto t1 = ((2 * b - a) / r_epsilon_3) * F * r;
|
|
auto t2_coeff = 3 / (2 * r_epsilon * r_epsilon * r_epsilon_3);
|
|
auto t2 = t2_coeff * (2 * b * (r.transpose().dot(F * r)) * r +
|
|
a * epsilon * epsilon * epsilon * F * r);
|
|
return t1 - t2;
|
|
};
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (kp.scale == 1) {
|
|
return kelvinlet(kp.ep[0]);
|
|
} else if (kp.scale == 2) {
|
|
// Regularized Kelvinlets: Formula (8)
|
|
return (kelvinlet(kp.ep[0]) - kelvinlet(kp.ep[1])) * 10;
|
|
}
|
|
// Regularized Kelvinlets: Formula (10)
|
|
return (kp.w[0] * kelvinlet(kp.ep[0]) + kp.w[1] * kelvinlet(kp.ep[1]) +
|
|
kp.w[2] * kelvinlet(kp.ep[2])) *
|
|
20;
|
|
};
|
|
|
|
// Implements the Bogacki-Shrampine ODE Solver
|
|
// https://en.wikipedia.org/wiki/Bogacki%E2%80%93Shampine_method
|
|
//
|
|
// It calculates the second and third order approximations which can be used to
|
|
// estimate the error in the integration step
|
|
//
|
|
// Inputs:
|
|
// t starting time
|
|
// dt delta time used to calculate brush tip displacement
|
|
// x dim-vector of point to be deformed
|
|
// x0 dim-vector of brush tip
|
|
// f dim-vector of brush force (translation)
|
|
// F dim by dim matrix of brush force matrix (linear)
|
|
// kp parameters for the kelvinlet brush like brush radius, scale etc
|
|
// Outputs:
|
|
// result dim vector holding the third order approximation result
|
|
// error The euclidean distance between the second and third order
|
|
// approximations
|
|
template<typename Scalar,
|
|
typename Derivedx,
|
|
typename Derivedx0,
|
|
typename Derivedf,
|
|
typename DerivedF>
|
|
IGL_INLINE void integrate(const Scalar t,
|
|
const Scalar dt,
|
|
const Eigen::MatrixBase<Derivedx>& x,
|
|
const Eigen::MatrixBase<Derivedx0>& x0,
|
|
const Eigen::MatrixBase<Derivedf>& f,
|
|
const Eigen::MatrixBase<DerivedF>& F,
|
|
const igl::KelvinletParams<Scalar>& kp,
|
|
Eigen::MatrixBase<Derivedx>& result,
|
|
Scalar& error)
|
|
{
|
|
constexpr Scalar a1 = 0;
|
|
constexpr Scalar a2 = 1 / 2.0f;
|
|
constexpr Scalar a3 = 3 / 4.0f;
|
|
constexpr Scalar a4 = 1.0f;
|
|
|
|
constexpr Scalar b21 = 1 / 2.0f;
|
|
constexpr Scalar b31 = 0;
|
|
constexpr Scalar b32 = 3 / 4.0f;
|
|
constexpr Scalar b41 = 2 / 9.0f;
|
|
constexpr Scalar b42 = 1 / 3.0f;
|
|
constexpr Scalar b43 = 4 / 9.0f;
|
|
|
|
constexpr Scalar c1 = 2 / 9.0f; // third order answer
|
|
constexpr Scalar c2 = 1 / 3.0f;
|
|
constexpr Scalar c3 = 4 / 9.0f;
|
|
|
|
constexpr Scalar d1 = 7 / 24.0f; // second order answer
|
|
constexpr Scalar d2 = 1 / 4.0f;
|
|
constexpr Scalar d3 = 1 / 3.0f;
|
|
constexpr Scalar d4 = 1 / 8.0f;
|
|
|
|
auto k1 = dt * kelvinlet_evaluator(t + dt * a1, x, x0, f, F, kp);
|
|
auto k2 = dt * kelvinlet_evaluator(t + dt * a2, x + k1 * b21, x0, f, F, kp);
|
|
auto k3 = dt * kelvinlet_evaluator(
|
|
t + dt * a3, x + k1 * b31 + k2 * b32, x0, f, F, kp);
|
|
auto k4 =
|
|
dt * kelvinlet_evaluator(
|
|
t + dt * a4, x + k1 * b41 + k2 * b42 + k3 * b43, x0, f, F, kp);
|
|
auto r1 = x + k1 * d1 + k2 * d2 + k3 * d3 + k4 * d4;
|
|
auto r2 = x + k1 * c1 + k2 * c2 + k3 * c3;
|
|
result = r2;
|
|
error = (r2 - r1).norm() / dt;
|
|
};
|
|
|
|
template<typename DerivedV,
|
|
typename Derivedx0,
|
|
typename Derivedf,
|
|
typename DerivedF,
|
|
typename DerivedU>
|
|
IGL_INLINE void kelvinlets(
|
|
const Eigen::MatrixBase<DerivedV>& V,
|
|
const Eigen::MatrixBase<Derivedx0>& x0,
|
|
const Eigen::MatrixBase<Derivedf>& f,
|
|
const Eigen::MatrixBase<DerivedF>& F,
|
|
const KelvinletParams<typename DerivedV::Scalar>& params,
|
|
Eigen::PlainObjectBase<DerivedU>& U)
|
|
{
|
|
using Scalar = typename DerivedV::Scalar;
|
|
constexpr auto max_error = 0.001f;
|
|
constexpr Scalar safety = 0.9;
|
|
|
|
const auto calc_displacement = [&](const int index) {
|
|
Scalar dt = 0.1;
|
|
Scalar t = 0;
|
|
|
|
Eigen::Matrix<Scalar, 3, 1> x = V.row(index).transpose();
|
|
decltype(x) result;
|
|
Scalar error;
|
|
// taking smaller steps seems to prevents weird inside-out artifacts in the
|
|
// final result. This implementation used an adaptive time step solver to
|
|
// numerically integrate the ODEs
|
|
while (t < 1) {
|
|
dt = std::min(dt, 1 - t);
|
|
integrate(t, dt, x, x0, f, F, params, result, error);
|
|
auto new_dt = dt * safety * std::pow(max_error / error, 1 / 3.0);
|
|
if (error <= max_error || dt <= 0.001) {
|
|
x = result;
|
|
t += dt;
|
|
dt = new_dt;
|
|
} else {
|
|
dt = std::max(abs(new_dt - dt) < 0.001 ? dt / 2.f : new_dt, 0.001);
|
|
}
|
|
}
|
|
U.row(index) = x.transpose();
|
|
};
|
|
|
|
const int n = V.rows();
|
|
U.resize(n, V.cols());
|
|
igl::parallel_for(n, calc_displacement, 1000);
|
|
}
|
|
}
|
|
#ifdef IGL_STATIC_LIBRARY
|
|
template void igl::kelvinlets<Eigen::Matrix<double, -1, -1, 0, -1, -1>,
|
|
Eigen::Matrix<double, 3, 1, 0, 3, 1>,
|
|
Eigen::Matrix<double, 3, 1, 0, 3, 1>,
|
|
Eigen::Matrix<double, 3, 3, 0, 3, 3>,
|
|
Eigen::Matrix<double, -1, -1, 0, -1, -1>>(
|
|
Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1>> const&,
|
|
Eigen::MatrixBase<Eigen::Matrix<double, 3, 1, 0, 3, 1>> const&,
|
|
Eigen::MatrixBase<Eigen::Matrix<double, 3, 1, 0, 3, 1>> const&,
|
|
Eigen::MatrixBase<Eigen::Matrix<double, 3, 3, 0, 3, 3>> const&,
|
|
igl::KelvinletParams<double> const&,
|
|
Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1>>&);
|
|
#endif
|