mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 11:23:42 +00:00
807520ca1d
* 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>
214 lines
8.3 KiB
C++
214 lines
8.3 KiB
C++
#ifndef IGL_FAST_WINDING_NUMBER
|
|
#define IGL_FAST_WINDING_NUMBER
|
|
#include "igl_inline.h"
|
|
#include "FastWindingNumberForSoups.h"
|
|
#include <Eigen/Core>
|
|
#include <vector>
|
|
namespace igl
|
|
{
|
|
/// Generate the precomputation for the fast winding number for point data
|
|
/// [Barill et. al 2018].
|
|
///
|
|
/// Given a set of 3D points P, with normals N, areas A, along with octree
|
|
/// data, and an expansion order, we define a taylor series expansion at each
|
|
/// octree cell.
|
|
///
|
|
/// The octree data is designed to come from igl::octree, and the areas (if not
|
|
/// obtained at scan time), may be calculated using
|
|
/// igl::copyleft::cgal::point_areas.
|
|
///
|
|
/// @param[in] P #P by 3 list of point locations
|
|
/// @param[in] N #P by 3 list of point normals
|
|
/// @param[in] A #P by 1 list of point areas
|
|
/// @param[in] point_indices a vector of vectors, where the ith entry is a vector of
|
|
/// the indices into P that are the ith octree cell's points
|
|
/// @param[in] CH #OctreeCells by 8, where the ith row is the indices of
|
|
/// the ith octree cell's children
|
|
/// @param[in] expansion_order the order of the taylor expansion. We support 0,1,2.
|
|
/// @param[out] CM #OctreeCells by 3 list of each cell's center of mass
|
|
/// @param[out] R #OctreeCells by 1 list of each cell's maximum distance of any point
|
|
/// to the center of mass
|
|
/// @param[out] EC #OctreeCells by #TaylorCoefficients list of expansion coefficients.
|
|
/// (Note that #TaylorCoefficients = ∑_{i=1}^{expansion_order} 3^i)
|
|
///
|
|
/// \see copyleft::cgal::point_areas, knn
|
|
template <
|
|
typename DerivedP,
|
|
typename DerivedA,
|
|
typename DerivedN,
|
|
typename Index,
|
|
typename DerivedCH,
|
|
typename DerivedCM,
|
|
typename DerivedR,
|
|
typename DerivedEC>
|
|
IGL_INLINE void fast_winding_number(
|
|
const Eigen::MatrixBase<DerivedP>& P,
|
|
const Eigen::MatrixBase<DerivedN>& N,
|
|
const Eigen::MatrixBase<DerivedA>& A,
|
|
const std::vector<std::vector<Index> > & point_indices,
|
|
const Eigen::MatrixBase<DerivedCH>& CH,
|
|
const int expansion_order,
|
|
Eigen::PlainObjectBase<DerivedCM>& CM,
|
|
Eigen::PlainObjectBase<DerivedR>& R,
|
|
Eigen::PlainObjectBase<DerivedEC>& EC);
|
|
/// Evaluate the fast winding number for point data, having already done the
|
|
/// the precomputation
|
|
///
|
|
/// @param[in] P #P by 3 list of point locations
|
|
/// @param[in] N #P by 3 list of point normals
|
|
/// @param[in] A #P by 1 list of point areas
|
|
/// @param[in] point_indices a vector of vectors, where the ith entry is a vector of
|
|
/// the indices into P that are the ith octree cell's points
|
|
/// @param[in] CH #OctreeCells by 8, where the ith row is the indices of
|
|
/// the ith octree cell's children
|
|
/// @param[in] CM #OctreeCells by 3 list of each cell's center of mass
|
|
/// @param[in] R #OctreeCells by 1 list of each cell's maximum distance of any point
|
|
/// to the center of mass
|
|
/// @param[in] EC #OctreeCells by #TaylorCoefficients list of expansion coefficients.
|
|
/// (Note that #TaylorCoefficients = ∑_{i=1}^{expansion_order} 3^i)
|
|
/// @param[in] Q #Q by 3 list of query points for the winding number
|
|
/// @param[in] beta This is a Barnes-Hut style accuracy term that separates near feild
|
|
/// from far field. The higher the beta, the more accurate and slower
|
|
/// the evaluation. We reccommend using a beta value of 2. Note that
|
|
/// for a beta value ≤ 0, we use the direct evaluation, rather than
|
|
/// the fast approximation
|
|
/// @param[out] WN #Q by 1 list of windinng number values at each query point
|
|
template <
|
|
typename DerivedP,
|
|
typename DerivedA,
|
|
typename DerivedN,
|
|
typename Index,
|
|
typename DerivedCH,
|
|
typename DerivedCM,
|
|
typename DerivedR,
|
|
typename DerivedEC,
|
|
typename DerivedQ,
|
|
typename BetaType,
|
|
typename DerivedWN>
|
|
IGL_INLINE void fast_winding_number(
|
|
const Eigen::MatrixBase<DerivedP>& P,
|
|
const Eigen::MatrixBase<DerivedN>& N,
|
|
const Eigen::MatrixBase<DerivedA>& A,
|
|
const std::vector<std::vector<Index> > & point_indices,
|
|
const Eigen::MatrixBase<DerivedCH>& CH,
|
|
const Eigen::MatrixBase<DerivedCM>& CM,
|
|
const Eigen::MatrixBase<DerivedR>& R,
|
|
const Eigen::MatrixBase<DerivedEC>& EC,
|
|
const Eigen::MatrixBase<DerivedQ>& Q,
|
|
const BetaType beta,
|
|
Eigen::PlainObjectBase<DerivedWN>& WN);
|
|
/// \overload
|
|
///
|
|
/// \brief Evaluate the fast winding number for point data without caching the
|
|
/// precomputation.
|
|
template <
|
|
typename DerivedP,
|
|
typename DerivedA,
|
|
typename DerivedN,
|
|
typename DerivedQ,
|
|
typename BetaType,
|
|
typename DerivedWN>
|
|
IGL_INLINE void fast_winding_number(
|
|
const Eigen::MatrixBase<DerivedP>& P,
|
|
const Eigen::MatrixBase<DerivedN>& N,
|
|
const Eigen::MatrixBase<DerivedA>& A,
|
|
const Eigen::MatrixBase<DerivedQ>& Q,
|
|
const int expansion_order,
|
|
const BetaType beta,
|
|
Eigen::PlainObjectBase<DerivedWN>& WN);
|
|
/// \overload
|
|
template <
|
|
typename DerivedP,
|
|
typename DerivedA,
|
|
typename DerivedN,
|
|
typename DerivedQ,
|
|
typename DerivedWN>
|
|
IGL_INLINE void fast_winding_number(
|
|
const Eigen::MatrixBase<DerivedP>& P,
|
|
const Eigen::MatrixBase<DerivedN>& N,
|
|
const Eigen::MatrixBase<DerivedA>& A,
|
|
const Eigen::MatrixBase<DerivedQ>& Q,
|
|
Eigen::PlainObjectBase<DerivedWN>& WN);
|
|
/// @private
|
|
namespace FastWindingNumber {
|
|
/// @private
|
|
namespace HDK_Sample{
|
|
/// @private
|
|
template <typename T1, typename T2> class UT_SolidAngle;} }
|
|
/// Structure for caching precomputation for fast winding number for triangle
|
|
/// soups
|
|
struct FastWindingNumberBVH {
|
|
/// @private
|
|
FastWindingNumber::HDK_Sample::UT_SolidAngle<float,float> ut_solid_angle;
|
|
// Need copies of these so they stay alive between calls.
|
|
/// @private
|
|
std::vector<FastWindingNumber::HDK_Sample::UT_Vector3T<float> > U;
|
|
std::vector<int> F;
|
|
};
|
|
/// Compute approximate winding number of a triangle soup mesh according to
|
|
/// "Fast Winding Numbers for Soups and Clouds" [Barill et al. 2018].
|
|
///
|
|
/// @param[in] V #V by 3 list of mesh vertex positions
|
|
/// @param[in] F #F by 3 list of triangle mesh indices into rows of V
|
|
/// @param[in] Q #Q by 3 list of query positions
|
|
/// @param[out] W #Q list of winding number values
|
|
template <
|
|
typename DerivedV,
|
|
typename DerivedF,
|
|
typename DerivedQ,
|
|
typename DerivedW>
|
|
IGL_INLINE void fast_winding_number(
|
|
const Eigen::MatrixBase<DerivedV> & V,
|
|
const Eigen::MatrixBase<DerivedF> & F,
|
|
const Eigen::MatrixBase<DerivedQ> & Q,
|
|
Eigen::PlainObjectBase<DerivedW> & W);
|
|
/// Precomputation for computing approximate winding numbers of a triangle
|
|
/// soup.
|
|
///
|
|
/// @param[in] V #V by 3 list of mesh vertex positions
|
|
/// @param[in] F #F by 3 list of triangle mesh indices into rows of V
|
|
/// @param[in] order Taylor series expansion order to use (e.g., 2)
|
|
/// @param[out] fwn_bvh Precomputed bounding volume hierarchy
|
|
///
|
|
template <
|
|
typename DerivedV,
|
|
typename DerivedF>
|
|
IGL_INLINE void fast_winding_number(
|
|
const Eigen::MatrixBase<DerivedV> & V,
|
|
const Eigen::MatrixBase<DerivedF> & F,
|
|
const int order,
|
|
FastWindingNumberBVH & fwn_bvh);
|
|
/// After precomputation, compute winding number at a each of many points in a
|
|
/// list.
|
|
///
|
|
/// @param[in] fwn_bvh Precomputed bounding volume hierarchy
|
|
/// @param[in] accuracy_scale parameter controlling accuracy (e.g., 2)
|
|
/// @param[in] Q #Q by 3 list of query positions
|
|
/// @param[out] W #Q list of winding number values
|
|
template <
|
|
typename DerivedQ,
|
|
typename DerivedW>
|
|
IGL_INLINE void fast_winding_number(
|
|
const FastWindingNumberBVH & fwn_bvh,
|
|
const float accuracy_scale,
|
|
const Eigen::MatrixBase<DerivedQ> & Q,
|
|
Eigen::PlainObjectBase<DerivedW> & W);
|
|
/// After precomputation, compute winding number at a single point
|
|
///
|
|
/// @param[in] fwn_bvh Precomputed bounding volume hierarchy
|
|
/// @param[in] accuracy_scale parameter controlling accuracy (e.g., 2)
|
|
/// @param[in] p single position
|
|
/// @return w winding number of this point
|
|
template <typename Derivedp>
|
|
IGL_INLINE typename Derivedp::Scalar fast_winding_number(
|
|
const FastWindingNumberBVH & fwn_bvh,
|
|
const float accuracy_scale,
|
|
const Eigen::MatrixBase<Derivedp> & p);
|
|
}
|
|
#ifndef IGL_STATIC_LIBRARY
|
|
# include "fast_winding_number.cpp"
|
|
#endif
|
|
|
|
#endif
|
|
|