mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 00:52:04 +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>
156 lines
7.0 KiB
C++
156 lines
7.0 KiB
C++
// This file is part of libigl, a simple c++ geometry processing library.
|
||
//
|
||
// Copyright (C) 2016 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_DECIMATE_H
|
||
#define IGL_DECIMATE_H
|
||
#include "igl_inline.h"
|
||
#include "decimate_callback_types.h"
|
||
#include "COLLAPSE_EDGE_NULL.h"
|
||
#include <Eigen/Core>
|
||
|
||
/// @file decimate.h
|
||
///
|
||
/// igl::decimate implements a customizable greedy edge collapser using a priority-queue:
|
||
///
|
||
/// Q ← {}
|
||
/// for each edge e
|
||
/// cost[e], placement[e] ← cost_and_placement(e)
|
||
/// Q.update( e, cost[e] )
|
||
///
|
||
/// while Q not empty
|
||
/// e ← Q.pop()
|
||
/// if cost[e] is finite
|
||
/// collapse_happened_flag = false
|
||
/// if pre_collapse( e )
|
||
/// collapse_happened_flag = collapse_edge( e )
|
||
/// post_collapse( e, collapse_happened_flag )
|
||
/// if collapse_happened_flag
|
||
/// for each neighbor edge f
|
||
/// cost[f], placement[f] ← cost_and_placement(f)
|
||
/// Q.update( f, cost[f] )
|
||
/// if stopping_condition()
|
||
/// break
|
||
/// else
|
||
/// cost[ e ] = ∞
|
||
/// Q.update( e, cost[e] )
|
||
///
|
||
///
|
||
/// There are four important callbacks that can be customized (decimate_callback_types.h). Note that any of these functions can capture user-defined book-keeping variables.
|
||
///
|
||
/// `cost_and_placement` This function is called for every original edge before
|
||
/// the queue processing starts and then on the “neighbors” (edges in the
|
||
/// two-ring) of a successfully collapsed edge. The function should output a
|
||
/// cost that would be paid if the given edge were to be collapsed to a single
|
||
/// vertex and the positional placement of that new vertex. Outputting a cost of
|
||
/// ∞ guarantees that the edge will not be collapsed.
|
||
///
|
||
/// `pre_collapse` This function is called just before `collapse_edge` is
|
||
/// attempted. If this function returns false then the collapse is aborted. This
|
||
/// callback is an opportunity for callers to conduct a final check whether the
|
||
/// collapse should really take place (e.g., based on the most current
|
||
/// information, which may not be available at the time that
|
||
/// `cost_and_placement` was called). This is rarely necessary and its preferred
|
||
/// to use cost_and_placement to assign uncollapsible edges ∞ cost if possible.
|
||
///
|
||
/// `post_collapse` This function is called after `collapse_edge` is attempted.
|
||
/// Since this collapse may have failed (e.g., it would create a non-manifold
|
||
/// mesh). This callback is provided a flag whether the attempted collapse
|
||
/// actually occurred. This callback is an opportunity for callers to update any
|
||
/// data-structures/book-keeping to acknowledge the successful (or failed)
|
||
/// collapse.
|
||
///
|
||
/// `stopping_condition` This function is called after a successful call to
|
||
/// `collapse_edge`. If this function returns true then the entire
|
||
/// queue-processing ends (e.g., if the number of remaining faces is below a
|
||
/// user’s threshold).
|
||
///
|
||
/// \see
|
||
/// collapse_least_cost_edge
|
||
/// collapse_edge
|
||
/// qslim
|
||
|
||
namespace igl
|
||
{
|
||
/// Assumes (V,F) is a manifold mesh (possibly with boundary) collapses edges
|
||
/// until desired number of faces is achieved. This uses default edge cost and
|
||
/// merged vertex placement functions {edge length, edge midpoint}.
|
||
///
|
||
/// See \fileinfo for more details.
|
||
///
|
||
/// @param[in] V #V by dim list of vertex positions
|
||
/// @param[in] F #F by 3 list of face indices into V.
|
||
/// @param[in] max_m desired number of output faces
|
||
/// @param[in] block_intersections whether to block intersections (see
|
||
/// intersection_blocking_collapse_edge_callbacks)
|
||
/// @param[out] U #U by dim list of output vertex posistions (can be same ref as V)
|
||
/// @param[out] G #G by 3 list of output face indices into U (can be same ref as G)
|
||
/// @param[out] J #G list of indices into F of birth face
|
||
/// @param[out] I #U list of indices into V of birth vertices
|
||
/// @return true if m was reached (otherwise #G > m)
|
||
IGL_INLINE bool decimate(
|
||
const Eigen::MatrixXd & V,
|
||
const Eigen::MatrixXi & F,
|
||
const int max_m,
|
||
const bool block_intersections,
|
||
Eigen::MatrixXd & U,
|
||
Eigen::MatrixXi & G,
|
||
Eigen::VectorXi & J,
|
||
Eigen::VectorXi & I);
|
||
|
||
/// Collapses edges of a **closed manifold mesh** (V,F) using user defined
|
||
/// callbacks in a priority queue. Functions control the cost and placement of each collapse the
|
||
/// stopping criteria for queue processing and the callbacks for pre and post
|
||
/// collapse operations. See the first implementation in decimate.cpp for an
|
||
/// example of how to deal with open/non-manifold meshes and how to adjust
|
||
/// cost and placement functions accordingly.
|
||
///
|
||
/// See \fileinfo for more details.
|
||
///
|
||
/// @param[in] V #V by dim list of vertex positions
|
||
/// @param[in] F #F by 3 list of face indices into V.
|
||
/// @param[in] cost_and_placement function computing cost of collapsing an edge and 3d
|
||
/// position where it should be placed:
|
||
/// cost_and_placement(V,F,E,EMAP,EF,EI,cost,placement);
|
||
/// @param[in] stopping_condition function returning whether to stop collapsing edges
|
||
/// based on current state. Guaranteed to be called after _successfully_
|
||
/// collapsing edge e removing edges (e,e1,e2) and faces (f1,f2):
|
||
/// bool should_stop =
|
||
/// stopping_condition(V,F,E,EMAP,EF,EI,Q,Qit,C,e,e1,e2,f1,f2);
|
||
/// @param[in] pre_collapse callback called with index of edge whose collapse is about
|
||
/// to be attempted (see collapse_least_cost_edge)
|
||
/// @param[in] post_collapse callback called with index of edge whose collapse was
|
||
/// just attempted and a flag revealing whether this was successful (see
|
||
/// collapse_least_cost_edge)
|
||
/// @param[out] U #U by dim list of output vertex posistions (can be same ref as V)
|
||
/// @param[out] G #G by 3 list of output face indices into U (can be same ref as G)
|
||
/// @param[out] J #G list of indices into F of birth face
|
||
/// @param[out] I #U list of indices into V of birth vertices
|
||
/// @return true if m was reached (otherwise #G > m)
|
||
///
|
||
/// \see connect_boundary_to_infinity
|
||
///
|
||
/// \bug E,EMAP,EF,EI seem to be immediately (re)computed from F. These inputs
|
||
/// are unused and it's not clear why.
|
||
IGL_INLINE bool decimate(
|
||
const Eigen::MatrixXd & V,
|
||
const Eigen::MatrixXi & F,
|
||
const decimate_cost_and_placement_callback & cost_and_placement,
|
||
const decimate_stopping_condition_callback & stopping_condition,
|
||
const decimate_pre_collapse_callback & pre_collapse,
|
||
const decimate_post_collapse_callback & post_collapse,
|
||
Eigen::MatrixXd & U,
|
||
Eigen::MatrixXi & G,
|
||
Eigen::VectorXi & J,
|
||
Eigen::VectorXi & I);
|
||
}
|
||
|
||
#ifndef IGL_STATIC_LIBRARY
|
||
# include "decimate.cpp"
|
||
#endif
|
||
#endif
|
||
|