mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 09:02:06 +00:00
dc5897d7b5
* 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>
299 lines
12 KiB
C++
299 lines
12 KiB
C++
// This file is part of libigl, a simple c++ geometry processing library.
|
|
//
|
|
// Copyright (C) 2022 Vladimir S. FONOV <vladimir.fonov@gmail.com>
|
|
// Copyright (C) 2024 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 "find_intersections.h"
|
|
|
|
#include "../AABB.h"
|
|
#include "../triangle_triangle_intersect_shared_edge.h"
|
|
#include "../triangle_triangle_intersect_shared_vertex.h"
|
|
#include "../find.h"
|
|
#include "../list_to_matrix.h"
|
|
#include "../placeholders.h"
|
|
#include "triangle_triangle_intersect.h"
|
|
#include "../triangle_triangle_intersect.h"
|
|
#include <stdio.h>
|
|
// atomic
|
|
#include <igl/parallel_for.h>
|
|
#include <atomic>
|
|
#include <mutex>
|
|
|
|
template <
|
|
typename DerivedV1,
|
|
typename DerivedF1,
|
|
typename DerivedV2,
|
|
typename DerivedF2,
|
|
typename DerivedIF,
|
|
typename DerivedCP >
|
|
IGL_INLINE bool igl::predicates::find_intersections(
|
|
const igl::AABB<DerivedV1,3> & tree1,
|
|
const Eigen::MatrixBase<DerivedV1> & V1,
|
|
const Eigen::MatrixBase<DerivedF1> & F1,
|
|
const Eigen::MatrixBase<DerivedV2> & V2,
|
|
const Eigen::MatrixBase<DerivedF2> & F2,
|
|
const bool first_only,
|
|
Eigen::PlainObjectBase<DerivedIF> & IF,
|
|
Eigen::PlainObjectBase<DerivedCP> & CP)
|
|
{
|
|
const bool detect_only = true;
|
|
constexpr bool stinker = false;
|
|
using AABBTree=igl::AABB<DerivedV1,3>;
|
|
using Scalar=typename DerivedV1::Scalar;
|
|
static_assert(
|
|
std::is_same<Scalar,typename DerivedV2::Scalar>::value,
|
|
"V1 and V2 must have the same scalar type");
|
|
using RowVector3S=Eigen::Matrix<Scalar,1,3>;
|
|
|
|
// Determine if V1,F1 and V2,F2 point to the same data
|
|
const bool self_test = (&V1 == &V2) && (&F1 == &F2);
|
|
if(stinker){ printf("%s\n",self_test?"🍎&(V1,F1) == 🍎&(V2,F2)":"🍎≠🍊"); }
|
|
|
|
int num_if = 0;
|
|
// mutex
|
|
std::mutex append_mutex;
|
|
const auto append_intersection =
|
|
[&IF,&CP,&num_if,&append_mutex]( const int f1, const int f2, const bool coplanar = false)
|
|
{
|
|
std::lock_guard<std::mutex> lock(append_mutex);
|
|
if(num_if >= IF.rows())
|
|
{
|
|
IF.conservativeResize(2*IF.rows()+1,2);
|
|
CP.conservativeResize(IF.rows());
|
|
}
|
|
CP(num_if) = coplanar;
|
|
IF.row(num_if) << f1,f2;
|
|
num_if++;
|
|
};
|
|
|
|
// Returns corner in ith face opposite of shared edge; -1 otherwise
|
|
const auto shared_edge = [&F1](const int f, const int g)->int
|
|
{
|
|
for(int c = 0;c<3;c++)
|
|
{
|
|
int s = F1(f,(c+1)%3);
|
|
int d = F1(f,(c+2)%3);
|
|
for(int e = 0;e<3;e++)
|
|
{
|
|
//// Find in opposite direction on gth face
|
|
//if(F1(g,e) == d && F1(g,(e+1)%3) == s)
|
|
// Find in either direction on gth face
|
|
if(
|
|
(F1(g,e) == d && F1(g,(e+1)%3) == s) ||
|
|
(F1(g,e) == s && F1(g,(e+1)%3) == d))
|
|
{
|
|
return c;
|
|
}
|
|
}
|
|
}
|
|
return -1;
|
|
};
|
|
// Returns corner of shared vertex in ith face; -1 otherwise
|
|
const auto shared_vertex = [&F1](const int f, const int g, int & sf, int & sg)->bool
|
|
{
|
|
for(sf = 0;sf<3;sf++)
|
|
{
|
|
for(sg = 0;sg<3;sg++)
|
|
{
|
|
if(F1(g,sg) == F1(f,sf))
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
};
|
|
|
|
RowVector3S dummy;
|
|
|
|
igl::parallel_for(F2.rows(),[&](const int f2)
|
|
{
|
|
if(stinker){ printf("f2: %d\n",f2); }
|
|
Eigen::AlignedBox<Scalar,3> box;
|
|
box.extend( V2.row( F2(f2,0) ).transpose() );
|
|
box.extend( V2.row( F2(f2,1) ).transpose() );
|
|
box.extend( V2.row( F2(f2,2) ).transpose() );
|
|
std::vector<const AABBTree*> candidates;
|
|
tree1.append_intersecting_leaves(box, candidates);
|
|
for(const auto * candidate : candidates)
|
|
{
|
|
const int f1 = candidate->m_primitive;
|
|
if(stinker){ printf(" f1: %d\n",f1); }
|
|
bool found_intersection = false;
|
|
bool yes_shared_verted = false;
|
|
bool yes_shared_edge = false;
|
|
if(self_test)
|
|
{
|
|
// Skip self-test and direction f2>=f1 (assumes by symmetry we'll find
|
|
// the other direction since we're testing all pairs)
|
|
if(f1 >= f2)
|
|
{
|
|
if(stinker){ printf(" ⏭\n"); }
|
|
continue;
|
|
}
|
|
const int c = shared_edge(f1,f2);
|
|
yes_shared_edge = c != -1;
|
|
if(yes_shared_edge)
|
|
{
|
|
if(stinker){ printf(" ⚠️ shared edge\n"); }
|
|
if(stinker)
|
|
{
|
|
printf(" %d: %d %d %d\n",f1,F1(f1,0),F1(f1,1),F1(f1,2));
|
|
printf(" %d: %d %d %d\n",f2,F1(f2,0),F1(f2,1),F1(f2,2));
|
|
printf(" edge: %d %d\n",F1(f1,(c+1)%3),F1(f1,(c+2)%3));
|
|
}
|
|
found_intersection = igl::triangle_triangle_intersect_shared_edge(
|
|
V1,F1,f1,c,V1.row(F1(f1,c)),f2,1e-8);
|
|
if(found_intersection)
|
|
{
|
|
append_intersection(f1,f2,true);
|
|
}
|
|
}else
|
|
{
|
|
int sf,sg;
|
|
yes_shared_verted = shared_vertex(f1,f2,sf,sg);
|
|
if(yes_shared_verted)
|
|
{
|
|
if(stinker){ printf(" ⚠️ shared vertex\n"); }
|
|
// Just to be sure. c≠sf
|
|
const int c = (sf+1)%3;
|
|
assert(F1(f1,sf) == F1(f2,sg));
|
|
found_intersection = igl::triangle_triangle_intersect_shared_vertex(
|
|
V1,F1,f1,sf,c,V1.row(F1(f1,c)),f2,sg,1e-14);
|
|
if(found_intersection && detect_only)
|
|
{
|
|
// But wait? Couldn't these be coplanar?
|
|
append_intersection(f1,f2,false);
|
|
}
|
|
}
|
|
|
|
}
|
|
}
|
|
// This logic is confusing.
|
|
if(
|
|
!self_test ||
|
|
(!yes_shared_verted && !yes_shared_edge) ||
|
|
(yes_shared_verted && found_intersection && !detect_only))
|
|
{
|
|
bool coplanar = false;
|
|
RowVector3S v1,v2;
|
|
const bool tt_found_intersection =
|
|
triangle_triangle_intersect(
|
|
V2.row(F2(f2,0)).template head<3>().eval(),
|
|
V2.row(F2(f2,1)).template head<3>().eval(),
|
|
V2.row(F2(f2,2)).template head<3>().eval(),
|
|
V1.row(F1(f1,0)).template head<3>().eval(),
|
|
V1.row(F1(f1,1)).template head<3>().eval(),
|
|
V1.row(F1(f1,2)).template head<3>().eval(),
|
|
coplanar);
|
|
if(found_intersection && !tt_found_intersection)
|
|
{
|
|
// We failed to find the edge. Mark it as an intersection but don't
|
|
// include edge.
|
|
append_intersection(f1,f2,coplanar);
|
|
}else if(tt_found_intersection)
|
|
{
|
|
found_intersection = true;
|
|
append_intersection(f1,f2,coplanar);
|
|
}
|
|
}
|
|
if(stinker) { printf(" %s\n",found_intersection? "☠️":"❌"); }
|
|
if(num_if && first_only) { return; }
|
|
}
|
|
if(num_if && first_only) { return; }
|
|
},1000);
|
|
IF.conservativeResize(num_if,2);
|
|
CP.conservativeResize(IF.rows());
|
|
return IF.rows();
|
|
}
|
|
|
|
template <
|
|
typename DerivedV1,
|
|
typename DerivedF1,
|
|
typename DerivedV2,
|
|
typename DerivedF2,
|
|
typename DerivedIF,
|
|
typename DerivedCP>
|
|
IGL_INLINE bool igl::predicates::find_intersections(
|
|
const Eigen::MatrixBase<DerivedV1> & V1,
|
|
const Eigen::MatrixBase<DerivedF1> & F1,
|
|
const Eigen::MatrixBase<DerivedV2> & V2,
|
|
const Eigen::MatrixBase<DerivedF2> & F2,
|
|
const bool first_only,
|
|
Eigen::PlainObjectBase<DerivedIF> & IF,
|
|
Eigen::PlainObjectBase<DerivedCP> & CP)
|
|
{
|
|
igl::AABB<DerivedV1,3> tree1;
|
|
tree1.init(V1,F1);
|
|
return find_intersections(tree1,V1,F1,V2,F2,first_only,IF,CP);
|
|
}
|
|
|
|
template <
|
|
typename DerivedV1,
|
|
typename DerivedF1,
|
|
typename DerivedV2,
|
|
typename DerivedF2,
|
|
typename DerivedIF,
|
|
typename DerivedCP,
|
|
typename DerivedEV,
|
|
typename DerivedEE,
|
|
typename DerivedEI>
|
|
IGL_INLINE bool igl::predicates::find_intersections(
|
|
const Eigen::MatrixBase<DerivedV1> & V1,
|
|
const Eigen::MatrixBase<DerivedF1> & F1,
|
|
const Eigen::MatrixBase<DerivedV2> & V2,
|
|
const Eigen::MatrixBase<DerivedF2> & F2,
|
|
Eigen::PlainObjectBase<DerivedIF> & IF,
|
|
Eigen::PlainObjectBase<DerivedCP> & CP,
|
|
Eigen::PlainObjectBase<DerivedEV> & EV,
|
|
Eigen::PlainObjectBase<DerivedEE> & EE,
|
|
Eigen::PlainObjectBase<DerivedEI> & EI)
|
|
{
|
|
igl::AABB<DerivedV1,3> tree1;
|
|
tree1.init(V1,F1);
|
|
return find_intersections(tree1,V1,F1,V2,F2,IF,CP,EV,EE,EI);
|
|
}
|
|
|
|
template <
|
|
typename DerivedV1,
|
|
typename DerivedF1,
|
|
typename DerivedV2,
|
|
typename DerivedF2,
|
|
typename DerivedIF,
|
|
typename DerivedCP,
|
|
typename DerivedEV,
|
|
typename DerivedEE,
|
|
typename DerivedEI>
|
|
IGL_INLINE bool igl::predicates::find_intersections(
|
|
const igl::AABB<DerivedV1,3> & tree1,
|
|
const Eigen::MatrixBase<DerivedV1> & V1,
|
|
const Eigen::MatrixBase<DerivedF1> & F1,
|
|
const Eigen::MatrixBase<DerivedV2> & V2,
|
|
const Eigen::MatrixBase<DerivedF2> & F2,
|
|
Eigen::PlainObjectBase<DerivedIF> & IF,
|
|
Eigen::PlainObjectBase<DerivedCP> & CP,
|
|
Eigen::PlainObjectBase<DerivedEV> & EV,
|
|
Eigen::PlainObjectBase<DerivedEE> & EE,
|
|
Eigen::PlainObjectBase<DerivedEI> & EI)
|
|
{
|
|
if(!find_intersections(tree1,V1,F1,V2,F2,false,IF,CP)) { return false; }
|
|
std::vector<int> EI_vec = igl::find((CP.array()==false).eval());
|
|
igl::list_to_matrix(EI_vec,EI);
|
|
const auto IF_EI = IF(EI_vec,igl::placeholders::all).eval();
|
|
igl::triangle_triangle_intersect(V1,F1,V2,F2,IF_EI,EV,EE);
|
|
return true;
|
|
}
|
|
|
|
#ifdef IGL_STATIC_LIBRARY
|
|
// Explicit template instantiation
|
|
// generated by autoexplicit.sh
|
|
template bool igl::predicates::find_intersections<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<int, -1, -1, 0, -1, -1>, Eigen::Array<bool, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Array<bool, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
|
|
// generated by autoexplicit.sh
|
|
template bool igl::predicates::find_intersections<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<int, -1, -1, 0, -1, -1>, Eigen::Array<bool, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(igl::AABB<Eigen::Matrix<double, -1, -1, 0, -1, -1>, 3> const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Array<bool, -1, 1, 0, -1, 1> >&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
|
|
// generated by autoexplicit.sh
|
|
template bool igl::predicates::find_intersections<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<int, -1, -1, 0, -1, -1>, Eigen::Array<bool, -1, 1, 0, -1, 1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::MatrixBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, bool, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> >&, Eigen::PlainObjectBase<Eigen::Array<bool, -1, 1, 0, -1, 1> >&);
|
|
#endif
|