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>
474 lines
14 KiB
C++
474 lines
14 KiB
C++
// This file is part of libigl, a simple c++ geometry processing library.
|
|
//
|
|
// Copyright (C) 2014 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/.
|
|
#ifndef IGL_WINDINGNUMBERTREE_H
|
|
#define IGL_WINDINGNUMBERTREE_H
|
|
#include <list>
|
|
#include <map>
|
|
#include <Eigen/Dense>
|
|
#include "WindingNumberMethod.h"
|
|
#include <memory>
|
|
|
|
namespace igl
|
|
{
|
|
/// Space partitioning tree for computing winding number hierarchically.
|
|
template <
|
|
typename Scalar,
|
|
typename Index>
|
|
class WindingNumberTree
|
|
{
|
|
public:
|
|
using Point = Eigen::Matrix<Scalar,1,3>;
|
|
// Method to use (see enum above)
|
|
//static double min_max_w;
|
|
static std::map<
|
|
std::pair<const WindingNumberTree*,const WindingNumberTree*>,
|
|
Scalar>
|
|
cached;
|
|
protected:
|
|
WindingNumberMethod method;
|
|
const WindingNumberTree * parent;
|
|
std::list<WindingNumberTree * > children;
|
|
typedef
|
|
Eigen::Matrix<Scalar,Eigen::Dynamic,Eigen::Dynamic>
|
|
MatrixXS;
|
|
typedef
|
|
Eigen::Matrix<Index,Eigen::Dynamic,Eigen::Dynamic>
|
|
MatrixXF;
|
|
// Base mesh vertices with duplicates removed (root will fill this in and
|
|
// then everyone's Vptr will point to it.
|
|
MatrixXS SV;
|
|
// Shared pointer to base mesh vertices
|
|
std::shared_ptr<MatrixXS> Vptr;
|
|
// Facets in this bounding volume
|
|
MatrixXF F;
|
|
// Tessellated boundary curve
|
|
MatrixXF cap;
|
|
// Upper Bound on radius of enclosing ball
|
|
Scalar radius;
|
|
// (Approximate) center (of mass)
|
|
Point center;
|
|
public:
|
|
inline WindingNumberTree();
|
|
// For root
|
|
template <typename DerivedV, typename DerivedF>
|
|
inline WindingNumberTree(
|
|
const Eigen::MatrixBase<DerivedV> & V,
|
|
const Eigen::MatrixBase<DerivedF> & F);
|
|
// For chilluns
|
|
inline WindingNumberTree(
|
|
const WindingNumberTree<Scalar,Index> & parent,
|
|
const typename igl::WindingNumberTree<Scalar,Index>::MatrixXF & F);
|
|
inline virtual ~WindingNumberTree();
|
|
inline void delete_children();
|
|
template <typename DerivedV, typename DerivedF>
|
|
inline void set_mesh(
|
|
const Eigen::MatrixBase<DerivedV> & V,
|
|
const Eigen::MatrixBase<DerivedF> & F);
|
|
// Set method
|
|
inline void set_method( const WindingNumberMethod & m);
|
|
public:
|
|
// Grow the Tree recursively
|
|
inline virtual void grow();
|
|
// Determine whether a given point is inside the bounding
|
|
//
|
|
// Inputs:
|
|
// p query point
|
|
// Returns true if the point p is inside this bounding volume
|
|
inline virtual bool inside(const Point & p) const;
|
|
// Compute the (partial) winding number of a given point p
|
|
// According to method
|
|
//
|
|
// Inputs:
|
|
// p query point
|
|
// Returns winding number
|
|
inline Scalar winding_number(const Point & p) const;
|
|
// Same as above, but always computes winding number using exact method
|
|
// (sum over every facet)
|
|
inline Scalar winding_number_all(const Point & p) const;
|
|
// Same as above, but always computes using sum over tessllated boundary
|
|
inline Scalar winding_number_boundary(const Point & p) const;
|
|
//// Same as winding_number above, but if max_simple_abs_winding_number is
|
|
//// less than some threshold min_max_w just return 0 (colloquially the "fast
|
|
//// multipole method)
|
|
////
|
|
////
|
|
//// Inputs:
|
|
//// p query point
|
|
//// min_max_w minimum max simple w to be processed
|
|
//// Returns approximate winding number
|
|
//double winding_number_approx_simple(
|
|
// const Point & p,
|
|
// const double min_max_w);
|
|
// Print contents of Tree
|
|
//
|
|
// Optional input:
|
|
// tab tab to show depth
|
|
inline void print(const char * tab="");
|
|
// Determine max absolute winding number
|
|
//
|
|
// Inputs:
|
|
// p query point
|
|
// Returns max winding number of
|
|
inline virtual Scalar max_abs_winding_number(const Point & p) const;
|
|
// Same as above, but stronger assumptions on (V,F). Assumes (V,F) is a
|
|
// simple polyhedron
|
|
inline virtual Scalar max_simple_abs_winding_number(const Point & p) const;
|
|
// Compute or read cached winding number for point p with respect to mesh
|
|
// in bounding box, recursing according to approximation criteria
|
|
//
|
|
// Inputs:
|
|
// p query point
|
|
// that WindingNumberTree containing mesh w.r.t. which we're computing w.n.
|
|
// Returns cached winding number
|
|
inline virtual Scalar cached_winding_number(const WindingNumberTree & that, const Point & p) const;
|
|
};
|
|
}
|
|
|
|
// Implementation
|
|
|
|
#include "WindingNumberTree.h"
|
|
#include "winding_number.h"
|
|
#include "triangle_fan.h"
|
|
#include "exterior_edges.h"
|
|
|
|
#include "PI.h"
|
|
#include "remove_duplicate_vertices.h"
|
|
|
|
#include <iostream>
|
|
#include <limits>
|
|
|
|
//template <typename Scalar, typename Index>
|
|
//WindingNumberMethod WindingNumberTree<Scalar,Index>::method = EXACT_WINDING_NUMBER_METHOD;
|
|
//template <typename Scalar, typename Index>
|
|
//double WindingNumberTree<Scalar,Index>::min_max_w = 0;
|
|
template <typename Scalar, typename Index>
|
|
std::map< std::pair<const igl::WindingNumberTree<Scalar,Index>*,const igl::WindingNumberTree<Scalar,Index>*>, Scalar>
|
|
igl::WindingNumberTree<Scalar,Index>::cached;
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline igl::WindingNumberTree<Scalar,Index>::WindingNumberTree():
|
|
method(EXACT_WINDING_NUMBER_METHOD),
|
|
parent(NULL),
|
|
SV(),
|
|
F(),
|
|
cap(),
|
|
radius(std::numeric_limits<Scalar>::infinity()),
|
|
center(0,0,0)
|
|
{
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
template <typename DerivedV, typename DerivedF>
|
|
inline igl::WindingNumberTree<Scalar,Index>::WindingNumberTree(
|
|
const Eigen::MatrixBase<DerivedV> & _V,
|
|
const Eigen::MatrixBase<DerivedF> & _F):
|
|
method(EXACT_WINDING_NUMBER_METHOD),
|
|
parent(NULL),
|
|
SV(),
|
|
F(),
|
|
cap(),
|
|
radius(std::numeric_limits<Scalar>::infinity()),
|
|
center(0,0,0)
|
|
{
|
|
set_mesh(_V,_F);
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
template <typename DerivedV, typename DerivedF>
|
|
inline void igl::WindingNumberTree<Scalar,Index>::set_mesh(
|
|
const Eigen::MatrixBase<DerivedV> & _V,
|
|
const Eigen::MatrixBase<DerivedF> & _F)
|
|
{
|
|
using namespace std;
|
|
// Remove any exactly duplicate vertices
|
|
// Q: Can this ever increase the complexity of the boundary?
|
|
// Q: Would we gain even more by remove almost exactly duplicate vertices?
|
|
Eigen::Matrix<typename MatrixXF::Scalar,Eigen::Dynamic,1> SVI,SVJ;
|
|
igl::remove_duplicate_vertices(_V,_F,0.0,SV,SVI,SVJ,F);
|
|
{
|
|
Eigen::Matrix<typename MatrixXF::Scalar,Eigen::Dynamic,2> EE;
|
|
igl::exterior_edges(F,EE);
|
|
triangle_fan(EE,cap);
|
|
}
|
|
// point Vptr to SV
|
|
Vptr = std::make_shared<MatrixXS>(SV);
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline igl::WindingNumberTree<Scalar,Index>::WindingNumberTree(
|
|
const igl::WindingNumberTree<Scalar,Index> & parent,
|
|
const typename igl::WindingNumberTree<Scalar,Index>::MatrixXF & _F):
|
|
method(parent.method),
|
|
parent(&parent),
|
|
Vptr(parent.Vptr),
|
|
SV(),
|
|
F(_F),
|
|
cap()
|
|
{
|
|
Eigen::Matrix<typename MatrixXF::Scalar,Eigen::Dynamic,2> EE;
|
|
igl::exterior_edges(F,EE);
|
|
triangle_fan(EE,cap);
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline igl::WindingNumberTree<Scalar,Index>::~WindingNumberTree()
|
|
{
|
|
delete_children();
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline void igl::WindingNumberTree<Scalar,Index>::delete_children()
|
|
{
|
|
using namespace std;
|
|
// Delete children
|
|
typename list<WindingNumberTree<Scalar,Index>* >::iterator cit = children.begin();
|
|
while(cit != children.end())
|
|
{
|
|
// clear the memory of this item
|
|
delete (* cit);
|
|
// erase from list, returns next element in iterator
|
|
cit = children.erase(cit);
|
|
}
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline void igl::WindingNumberTree<Scalar,Index>::set_method(const WindingNumberMethod & m)
|
|
{
|
|
this->method = m;
|
|
for(auto child : children)
|
|
{
|
|
child->set_method(m);
|
|
}
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline void igl::WindingNumberTree<Scalar,Index>::grow()
|
|
{
|
|
// Don't grow
|
|
return;
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline bool igl::WindingNumberTree<Scalar,Index>::inside(const Point & /*p*/) const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline Scalar
|
|
igl::WindingNumberTree<Scalar,Index>::winding_number(const Point & p) const
|
|
{
|
|
using namespace std;
|
|
//cout<<"+"<<boundary.rows();
|
|
// If inside then we need to be careful
|
|
if(inside(p))
|
|
{
|
|
// If not a leaf then recurse
|
|
if(children.size()>0)
|
|
{
|
|
// Recurse on each child and accumulate
|
|
Scalar sum = 0;
|
|
for(
|
|
typename list<WindingNumberTree<Scalar,Index>* >::const_iterator cit = children.begin();
|
|
cit != children.end();
|
|
cit++)
|
|
{
|
|
switch(method)
|
|
{
|
|
case EXACT_WINDING_NUMBER_METHOD:
|
|
sum += (*cit)->winding_number(p);
|
|
break;
|
|
case APPROX_SIMPLE_WINDING_NUMBER_METHOD:
|
|
case APPROX_CACHE_WINDING_NUMBER_METHOD:
|
|
//if((*cit)->max_simple_abs_winding_number(p) > min_max_w)
|
|
//{
|
|
sum += (*cit)->winding_number(p);
|
|
//}
|
|
break;
|
|
default:
|
|
assert(false);
|
|
break;
|
|
}
|
|
}
|
|
return sum;
|
|
}else
|
|
{
|
|
return winding_number_all(p);
|
|
}
|
|
}else{
|
|
// Otherwise we can just consider boundary
|
|
// Q: If we using the "multipole" method should we also subdivide the
|
|
// boundary case?
|
|
if((cap.rows() - 2) < F.rows())
|
|
{
|
|
switch(method)
|
|
{
|
|
case EXACT_WINDING_NUMBER_METHOD:
|
|
return winding_number_boundary(p);
|
|
case APPROX_SIMPLE_WINDING_NUMBER_METHOD:
|
|
{
|
|
Scalar dist = (p-center).norm();
|
|
// Radius is already an overestimate of inside
|
|
if(dist>1.0*radius)
|
|
{
|
|
return 0;
|
|
}else
|
|
{
|
|
return winding_number_boundary(p);
|
|
}
|
|
}
|
|
case APPROX_CACHE_WINDING_NUMBER_METHOD:
|
|
{
|
|
return parent->cached_winding_number(*this,p);
|
|
}
|
|
default: assert(false);break;
|
|
}
|
|
}else
|
|
{
|
|
// doesn't pay off to use boundary
|
|
return winding_number_all(p);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline Scalar
|
|
igl::WindingNumberTree<Scalar,Index>::winding_number_all(const Point & p) const
|
|
{
|
|
return igl::winding_number(*Vptr,F,p);
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline Scalar
|
|
igl::WindingNumberTree<Scalar,Index>::winding_number_boundary(const Point & p) const
|
|
{
|
|
return igl::winding_number(*Vptr,cap,p);
|
|
}
|
|
|
|
//template <typename Scalar, typename Index>
|
|
//inline double igl::WindingNumberTree<Scalar,Index>::winding_number_approx_simple(
|
|
// const Point & p,
|
|
// const double min_max_w)
|
|
//{
|
|
// using namespace std;
|
|
// if(max_simple_abs_winding_number(p) > min_max_w)
|
|
// {
|
|
// return winding_number(p);
|
|
// }else
|
|
// {
|
|
// cout<<"Skipped! "<<max_simple_abs_winding_number(p)<<"<"<<min_max_w<<endl;
|
|
// return 0;
|
|
// }
|
|
//}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline void igl::WindingNumberTree<Scalar,Index>::print(const char * tab)
|
|
{
|
|
using namespace std;
|
|
// Print all facets
|
|
cout<<tab<<"["<<endl<<F<<endl<<"]";
|
|
// Print children
|
|
for(
|
|
typename list<WindingNumberTree<Scalar,Index>* >::iterator cit = children.begin();
|
|
cit != children.end();
|
|
cit++)
|
|
{
|
|
cout<<","<<endl;
|
|
(*cit)->print((string(tab)+"").c_str());
|
|
}
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline Scalar
|
|
igl::WindingNumberTree<Scalar,Index>::max_abs_winding_number(const Point & /*p*/) const
|
|
{
|
|
return std::numeric_limits<Scalar>::infinity();
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline Scalar
|
|
igl::WindingNumberTree<Scalar,Index>::max_simple_abs_winding_number(
|
|
const Point & /*p*/) const
|
|
{
|
|
using namespace std;
|
|
return numeric_limits<Scalar>::infinity();
|
|
}
|
|
|
|
template <typename Scalar, typename Index>
|
|
inline Scalar
|
|
igl::WindingNumberTree<Scalar,Index>::cached_winding_number(
|
|
const igl::WindingNumberTree<Scalar,Index> & that,
|
|
const Point & p) const
|
|
{
|
|
using namespace std;
|
|
// Simple metric for `is_far`
|
|
//
|
|
// this that
|
|
// --------
|
|
// ----- / | \ .
|
|
// / r \ / R \ .
|
|
// | p ! | | ! |
|
|
// \_____/ \ /
|
|
// \________/
|
|
//
|
|
//
|
|
// a = angle formed by trapazoid formed by raising sides with lengths r and R
|
|
// at respective centers.
|
|
//
|
|
// a = atan2(R-r,d), where d is the distance between centers
|
|
|
|
// That should be bigger (what about parent? what about sister?)
|
|
bool is_far = this->radius<that.radius;
|
|
if(is_far)
|
|
{
|
|
Scalar a = atan2(
|
|
that.radius - this->radius,
|
|
(that.center - this->center).norm());
|
|
assert(a>0);
|
|
is_far = (a<PI/8.0);
|
|
}
|
|
|
|
if(is_far)
|
|
{
|
|
// Not implemented yet
|
|
pair<const WindingNumberTree*,const WindingNumberTree*> this_that(this,&that);
|
|
// Need to compute it for first time?
|
|
if(cached.count(this_that)==0)
|
|
{
|
|
cached[this_that] =
|
|
that.winding_number_boundary(this->center);
|
|
}
|
|
return cached[this_that];
|
|
}else if(children.size() == 0)
|
|
{
|
|
// not far and hierarchy ended too soon: can't use cache
|
|
return that.winding_number_boundary(p);
|
|
}else
|
|
{
|
|
for(
|
|
typename list<WindingNumberTree<Scalar,Index>* >::const_iterator cit = children.begin();
|
|
cit != children.end();
|
|
cit++)
|
|
{
|
|
if((*cit)->inside(p))
|
|
{
|
|
return (*cit)->cached_winding_number(that,p);
|
|
}
|
|
}
|
|
// Not inside any children? This can totally happen because bounding boxes
|
|
// are set to bound contained facets. So sibilings may overlap and their
|
|
// union may not contain their parent (though, their union is certainly a
|
|
// subset of their parent).
|
|
assert(false);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#endif
|