mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-16 01:52:11 +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>
379 lines
13 KiB
C++
379 lines
13 KiB
C++
// This file is part of libigl, a simple c++ geometry processing library.
|
||
//
|
||
// Copyright (C) 2020 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
|
||
// obtain one at http://mozilla.org/MPL/2.0/.
|
||
#include "blue_noise.h"
|
||
#include "doublearea.h"
|
||
#include "random_points_on_mesh.h"
|
||
#include "sortrows.h"
|
||
#include "placeholders.h"
|
||
#include "PI.h"
|
||
#include "get_seconds.h"
|
||
#include <unordered_map>
|
||
#include <algorithm>
|
||
#include <vector>
|
||
#include <random>
|
||
#include <cstdint>
|
||
|
||
namespace igl
|
||
{
|
||
// It is very important that we use 64bit keys to avoid out of bounds (easy to
|
||
// get to happen with dense samplings (e.g., r = 0.0005*bbd)
|
||
typedef std::int64_t BlueNoiseKeyType;
|
||
}
|
||
|
||
// Helper functions
|
||
namespace igl
|
||
{
|
||
// Should probably find and replace with less generic name
|
||
//
|
||
// Map 3D subscripts (x,y,z) to unique index (return value)
|
||
//
|
||
// Inputs:
|
||
// w side length of w×w×w integer cube lattice
|
||
// x subscript along x direction
|
||
// y subscript along y direction
|
||
// z subscript along z direction
|
||
// Returns index value
|
||
//
|
||
inline BlueNoiseKeyType blue_noise_key(
|
||
const BlueNoiseKeyType w, // pass by copy --> int64_t so that multiplication is OK
|
||
const BlueNoiseKeyType x, // pass by copy --> int64_t so that multiplication is OK
|
||
const BlueNoiseKeyType y, // pass by copy --> int64_t so that multiplication is OK
|
||
const BlueNoiseKeyType z) // pass by copy --> int64_t so that multiplication is OK
|
||
{
|
||
return x+w*(y+w*z);
|
||
}
|
||
// Determine if a query candidate at position X.row(i) is too close to already
|
||
// selected sites (stored in S).
|
||
//
|
||
// Inputs:
|
||
// X #X by 3 list of raw candidate positions
|
||
// Xs #Xs by 3 list of corresponding integer cell subscripts
|
||
// i index of candidate in question
|
||
// S map from cell index to index into X of selected candidate (or -1 if
|
||
// cell is currently empty)
|
||
// rr Poisson disk radius squared
|
||
// w side length of w×w×w integer cube lattice (into which Xs subscripts)
|
||
template <
|
||
typename DerivedX,
|
||
typename DerivedXs>
|
||
inline bool blue_noise_far_enough(
|
||
const Eigen::MatrixBase<DerivedX> & X,
|
||
const Eigen::MatrixBase<DerivedXs> & Xs,
|
||
const std::unordered_map<BlueNoiseKeyType,int> & S,
|
||
const double & rr,
|
||
const int & w,
|
||
const int i)
|
||
{
|
||
const int xi = Xs(i,0);
|
||
const int yi = Xs(i,1);
|
||
const int zi = Xs(i,2);
|
||
int g = 2; // ceil(r/s)
|
||
for(int x = std::max(xi-g,0);x<=std::min(xi+g,w-1);x++)
|
||
for(int y = std::max(yi-g,0);y<=std::min(yi+g,w-1);y++)
|
||
for(int z = std::max(zi-g,0);z<=std::min(zi+g,w-1);z++)
|
||
{
|
||
if(x!=xi || y!=yi || z!=zi)
|
||
{
|
||
const BlueNoiseKeyType nk = blue_noise_key(w,x,y,z);
|
||
// have already selected from this cell
|
||
const auto Siter = S.find(nk);
|
||
if(Siter !=S.end() && Siter->second >= 0)
|
||
{
|
||
const int ni = Siter->second;
|
||
// too close
|
||
if( (X.row(i)-X.row(ni)).squaredNorm() < rr)
|
||
{
|
||
return false;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
return true;
|
||
}
|
||
// Try to activate a candidate in a given cell
|
||
//
|
||
// Inputs:
|
||
// X #X by 3 list of raw candidate positions
|
||
// Xs #Xs by 3 list of corresponding integer cell subscripts
|
||
// rr Poisson disk radius squared
|
||
// w side length of w×w×w integer cube lattice (into which Xs subscripts)
|
||
// nk index of cell in which we'd like to activate a candidate
|
||
// M map from cell index to list of candidates
|
||
// S map from cell index to index into X of selected candidate (or -1 if
|
||
// cell is currently empty)
|
||
// active list of indices into X of active candidates
|
||
// Outputs:
|
||
// M visited candidates deemed too close to already selected points are
|
||
// removed
|
||
// S updated to reflect activated point (if successful)
|
||
// active updated to reflect activated point (if successful)
|
||
// Returns true iff activation was successful
|
||
template <
|
||
typename DerivedX,
|
||
typename DerivedXs>
|
||
inline bool activate(
|
||
const Eigen::MatrixBase<DerivedX> & X,
|
||
const Eigen::MatrixBase<DerivedXs> & Xs,
|
||
const double & rr,
|
||
const int & i,
|
||
const int & w,
|
||
const BlueNoiseKeyType & nk,
|
||
std::unordered_map<BlueNoiseKeyType,std::vector<int> > & M,
|
||
std::unordered_map<BlueNoiseKeyType,int> & S,
|
||
std::vector<int> & active)
|
||
{
|
||
assert(M.count(nk));
|
||
auto & Mvec = M.find(nk)->second;
|
||
auto miter = Mvec.begin();
|
||
while(miter != Mvec.end())
|
||
{
|
||
const int mi = *miter;
|
||
// mi is our candidate sample. Is it far enough from all existing
|
||
// samples?
|
||
if(i>=0 && (X.row(i)-X.row(mi)).squaredNorm() > 4.*rr)
|
||
{
|
||
// too far skip (reject)
|
||
miter++;
|
||
} else if(blue_noise_far_enough(X,Xs,S,rr,w,mi))
|
||
{
|
||
active.push_back(mi);
|
||
S.find(nk)->second = mi;
|
||
//printf(" found %d\n",mi);
|
||
return true;
|
||
}else
|
||
{
|
||
// remove forever (instead of incrementing we swap and eat from the
|
||
// back)
|
||
//std::swap(*miter,Mvec.back());
|
||
*miter = Mvec.back();
|
||
bool was_last = (std::next(miter) == Mvec.end());
|
||
Mvec.pop_back();
|
||
if (was_last) {
|
||
// popping from the vector can invalidate the iterator, if it was
|
||
// pointing to the last element that was popped. Alternatively,
|
||
// one could use indices directly...
|
||
miter = Mvec.end();
|
||
}
|
||
}
|
||
}
|
||
return false;
|
||
}
|
||
|
||
template <
|
||
typename DerivedX,
|
||
typename DerivedXs,
|
||
typename URBG>
|
||
inline bool step(
|
||
const Eigen::MatrixBase<DerivedX> & X,
|
||
const Eigen::MatrixBase<DerivedXs> & Xs,
|
||
const double & rr,
|
||
const int & w,
|
||
URBG && urbg,
|
||
std::unordered_map<BlueNoiseKeyType,std::vector<int> > & M,
|
||
std::unordered_map<BlueNoiseKeyType,int> & S,
|
||
std::vector<int> & active,
|
||
std::vector<int> & collected
|
||
)
|
||
{
|
||
//considered.clear();
|
||
if(active.size() == 0) return false;
|
||
// random entry
|
||
std::uniform_int_distribution<> dis(0, active.size()-1);
|
||
const int e = dis(urbg);
|
||
const int i = active[e];
|
||
//printf("%d\n",i);
|
||
const int xi = Xs(i,0);
|
||
const int yi = Xs(i,1);
|
||
const int zi = Xs(i,2);
|
||
//printf("%d %d %d - %g %g %g\n",xi,yi,zi,X(i,0),X(i,1),X(i,2));
|
||
// cell indices of neighbors
|
||
int g = 4;
|
||
std::vector<BlueNoiseKeyType> N;N.reserve((1+g*1)^3-1);
|
||
for(int x = std::max(xi-g,0);x<=std::min(xi+g,w-1);x++)
|
||
for(int y = std::max(yi-g,0);y<=std::min(yi+g,w-1);y++)
|
||
for(int z = std::max(zi-g,0);z<=std::min(zi+g,w-1);z++)
|
||
{
|
||
if(x!=xi || y!=yi || z!=zi)
|
||
{
|
||
//printf(" %d %d %d\n",x,y,z);
|
||
const BlueNoiseKeyType nk = blue_noise_key(w,x,y,z);
|
||
// haven't yet selected from this cell?
|
||
const auto Siter = S.find(nk);
|
||
if(Siter !=S.end() && Siter->second < 0)
|
||
{
|
||
assert(M.find(nk) != M.end());
|
||
N.emplace_back(nk);
|
||
}
|
||
}
|
||
}
|
||
//printf(" --------\n");
|
||
// randomize order: this might be a little paranoid...
|
||
std::shuffle(std::begin(N), std::end(N), urbg);
|
||
bool found = false;
|
||
for(const BlueNoiseKeyType & nk : N)
|
||
{
|
||
assert(M.find(nk) != M.end());
|
||
if(activate(X,Xs,rr,i,w,nk,M,S,active))
|
||
{
|
||
found = true;
|
||
break;
|
||
}
|
||
}
|
||
if(!found)
|
||
{
|
||
// remove i from active list
|
||
// https://stackoverflow.com/a/60765833/148668
|
||
collected.push_back(i);
|
||
//printf(" before: "); for(const int j : active) { printf("%d ",j); } printf("\n");
|
||
std::swap(active[e], active.back());
|
||
//printf(" after : "); for(const int j : active) { printf("%d ",j); } printf("\n");
|
||
active.pop_back();
|
||
//printf(" removed %d\n",i);
|
||
}
|
||
//printf(" active: "); for(const int j : active) { printf("%d ",j); } printf("\n");
|
||
return true;
|
||
}
|
||
}
|
||
|
||
template <
|
||
typename DerivedV,
|
||
typename DerivedF,
|
||
typename DerivedB,
|
||
typename DerivedFI,
|
||
typename DerivedP,
|
||
typename URBG>
|
||
IGL_INLINE void igl::blue_noise(
|
||
const Eigen::MatrixBase<DerivedV> & V,
|
||
const Eigen::MatrixBase<DerivedF> & F,
|
||
const typename DerivedV::Scalar r,
|
||
Eigen::PlainObjectBase<DerivedB> & B,
|
||
Eigen::PlainObjectBase<DerivedFI> & FI,
|
||
Eigen::PlainObjectBase<DerivedP> & P,
|
||
URBG && urbg)
|
||
{
|
||
typedef typename DerivedV::Scalar Scalar;
|
||
// float+RowMajor is faster...
|
||
typedef Eigen::Matrix<Scalar,Eigen::Dynamic,3,Eigen::RowMajor> MatrixX3S;
|
||
assert(V.cols() == 3 && "Only 3D embeddings allowed");
|
||
// minimum radius
|
||
const Scalar min_r = r;
|
||
// cell size based on 3D distance
|
||
// It works reasonably well (but is probably biased to use s=2*r/√3 here and
|
||
// g=1 in the outer loop below.
|
||
//
|
||
// One thing to try would be to store a list in S (rather than a single point)
|
||
// or equivalently a mask over M and just use M as a generic spatial hash
|
||
// (with arbitrary size) and then tune its size (being careful to make g a
|
||
// function of r and s; and removing the `if S=-1 checks`)
|
||
const Scalar s = r/sqrt(3.0);
|
||
|
||
const double area =
|
||
[&](){Eigen::VectorXd A;igl::doublearea(V,F,A);return A.array().sum()/2;}();
|
||
// Circle packing in the plane has igl::PI*sqrt(3)/6 efficiency
|
||
const double expected_number_of_points =
|
||
area * (igl::PI * sqrt(3.0) / 6.0) / (igl::PI * min_r * min_r / 4.0);
|
||
|
||
// Make a uniform random sampling with 30*expected_number_of_points.
|
||
const int nx = 30.0*expected_number_of_points;
|
||
MatrixX3S X,XB;
|
||
Eigen::VectorXi XFI;
|
||
igl::random_points_on_mesh(nx,V,F,XB,XFI,X,urbg);
|
||
|
||
// Rescale so that s = 1
|
||
Eigen::Matrix<int,Eigen::Dynamic,3,Eigen::RowMajor> Xs =
|
||
((X.rowwise()-X.colwise().minCoeff())/s).template cast<int>();
|
||
const int w = Xs.maxCoeff()+1;
|
||
{
|
||
Eigen::VectorXi I;
|
||
igl::sortrows(decltype(Xs)(Xs),true,Xs,I);
|
||
X = X(I,igl::placeholders::all).eval();
|
||
// These two could be spun off in their own thread.
|
||
XB = XB(I,igl::placeholders::all).eval();
|
||
XFI = XFI(I,igl::placeholders::all).eval();
|
||
}
|
||
// Initialization
|
||
std::unordered_map<BlueNoiseKeyType,std::vector<int> > M;
|
||
std::unordered_map<BlueNoiseKeyType, int > S;
|
||
// attempted to seed
|
||
std::unordered_map<BlueNoiseKeyType, int > A;
|
||
// Q: Too many?
|
||
// A: Seems to help though.
|
||
M.reserve(Xs.rows());
|
||
S.reserve(Xs.rows());
|
||
for(int i = 0;i<Xs.rows();i++)
|
||
{
|
||
BlueNoiseKeyType k = blue_noise_key(w,Xs(i,0),Xs(i,1),Xs(i,2));
|
||
const auto Miter = M.find(k);
|
||
if(Miter == M.end())
|
||
{
|
||
M.insert({k,{i}});
|
||
}else
|
||
{
|
||
Miter->second.push_back(i);
|
||
}
|
||
S.emplace(k,-1);
|
||
A.emplace(k,false);
|
||
}
|
||
|
||
std::vector<int> active;
|
||
// precompute r²
|
||
// Q: is this necessary?
|
||
const double rr = r*r;
|
||
std::vector<int> collected;
|
||
collected.reserve(2.0*expected_number_of_points);
|
||
|
||
auto Mouter = M.begin();
|
||
// Just take the first point as the initial seed
|
||
const auto initialize = [&]()->bool
|
||
{
|
||
while(true)
|
||
{
|
||
if(Mouter == M.end())
|
||
{
|
||
return false;
|
||
}
|
||
const BlueNoiseKeyType k = Mouter->first;
|
||
// Haven't placed in this cell yet
|
||
if(S[k]<0)
|
||
{
|
||
if(activate(X,Xs,rr,-1,w,k,M,S,active)) return true;
|
||
}
|
||
Mouter++;
|
||
}
|
||
assert(false && "should not be reachable.");
|
||
};
|
||
|
||
// important if mesh contains many connected components
|
||
while(initialize())
|
||
{
|
||
while(active.size()>0)
|
||
{
|
||
step(X,Xs,rr,w,urbg,M,S,active,collected);
|
||
}
|
||
}
|
||
{
|
||
const int n = collected.size();
|
||
P.resize(n,3);
|
||
B.resize(n,3);
|
||
FI.resize(n);
|
||
for(int i = 0;i<n;i++)
|
||
{
|
||
const int c = collected[i];
|
||
P.row(i) = X.row(c).template cast<typename DerivedP::Scalar>();
|
||
B.row(i) = XB.row(c).template cast<typename DerivedB::Scalar>();
|
||
FI(i) = XFI(c);
|
||
}
|
||
}
|
||
}
|
||
|
||
#ifdef IGL_STATIC_LIBRARY
|
||
// Explicit template instantiation
|
||
template void igl::blue_noise<Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, std::mt19937_64 >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::Matrix<double, -1, -1, 0, -1, -1>::Scalar, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&, std::mt19937_64&&);
|
||
template void igl::blue_noise<Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, std::mt19937 >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::Matrix<double, -1, -1, 0, -1, -1>::Scalar, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&, std::mt19937&&);
|
||
#endif
|