mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 00:52:04 +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>
162 lines
7.0 KiB
C++
162 lines
7.0 KiB
C++
// This file is part of libigl, a simple c++ geometry processing library.
|
|
//
|
|
// Copyright (C) 2021 Vladimir S. FONOV <vladimir.fonov@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/
|
|
|
|
/*
|
|
*
|
|
* C++ version based on the routines published in
|
|
* "Fast and Robust Triangle-Triangle Overlap Test
|
|
* Using Orientation Predicates" P. Guigue - O. Devillers
|
|
*
|
|
* Works with Eigen data structures instead of plain C arrays
|
|
* returns bool values
|
|
*
|
|
* Code is rewritten to get rid of the macros and use C++ lambda and
|
|
* inline functions instead
|
|
*
|
|
* Original notice:
|
|
*
|
|
* Triangle-Triangle Overlap Test Routines
|
|
* July, 2002
|
|
* Updated December 2003
|
|
*
|
|
* Updated by Vladimir S. FONOV
|
|
* March, 2023
|
|
*
|
|
* This file contains C implementation of algorithms for
|
|
* performing two and three-dimensional triangle-triangle intersection test
|
|
* The algorithms and underlying theory are described in
|
|
*
|
|
* "Fast and Robust Triangle-Triangle Overlap Test
|
|
* Using Orientation Predicates" P. Guigue - O. Devillers
|
|
*
|
|
* Journal of Graphics Tools, 8(1), 2003
|
|
*
|
|
* Several geometric predicates are defined. Their parameters are all
|
|
* points. Each point is an array of two or three double precision
|
|
* floating point numbers. The geometric predicates implemented in
|
|
* this file are:
|
|
*
|
|
* int tri_tri_overlap_test_3d(p1,q1,r1,p2,q2,r2)
|
|
* int tri_tri_overlap_test_2d(p1,q1,r1,p2,q2,r2)
|
|
*
|
|
* int tri_tri_intersection_test_3d(p1,q1,r1,p2,q2,r2,
|
|
* coplanar,source,target)
|
|
*
|
|
* is a version that computes the segment of intersection when
|
|
* the triangles overlap (and are not coplanar)
|
|
*
|
|
* each function returns 1 if the triangles (including their
|
|
* boundary) intersect, otherwise 0
|
|
*
|
|
*
|
|
* Other information are available from the Web page
|
|
* http://www.acm.org/jgt/papers/GuigueDevillers03/
|
|
*
|
|
*/
|
|
|
|
/*
|
|
Original MIT License (from https://github.com/erich666/jgt-code)
|
|
Copyright (c) <year> <copyright holders>
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
|
|
and associated documentation files (the "Software"), to deal in the Software without
|
|
restriction, including without limitation the rights to use, copy, modify, merge, publish,
|
|
distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
|
|
Software is furnished to do so, subject to the following conditions:
|
|
|
|
The above copyright notice and this permission notice shall be included in all copies or
|
|
substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
|
|
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
|
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
#pragma once
|
|
#ifndef IGL_TRI_TRI_INTERSECT_H
|
|
#define IGL_TRI_TRI_INTERSECT_H
|
|
|
|
#include "igl_inline.h"
|
|
#include <Eigen/Core>
|
|
|
|
namespace igl {
|
|
|
|
|
|
// Three-dimensional Triangle-Triangle overlap test
|
|
// if triangles are co-planar
|
|
//
|
|
// Input:
|
|
// p1,q1,r1 - vertices of the 1st triangle (3D)
|
|
// p2,q2,r2 - vertices of the 2nd triangle (3D)
|
|
//
|
|
// Output:
|
|
//
|
|
// Return true if two triangles overlap
|
|
template <typename DerivedP1,typename DerivedQ1,typename DerivedR1,
|
|
typename DerivedP2,typename DerivedQ2,typename DerivedR2>
|
|
IGL_INLINE bool tri_tri_overlap_test_3d(
|
|
const Eigen::MatrixBase<DerivedP1> & p1,
|
|
const Eigen::MatrixBase<DerivedQ1> & q1,
|
|
const Eigen::MatrixBase<DerivedR1> & r1,
|
|
const Eigen::MatrixBase<DerivedP2> & p2,
|
|
const Eigen::MatrixBase<DerivedQ2> & q2,
|
|
const Eigen::MatrixBase<DerivedR2> & r2);
|
|
|
|
|
|
// Three-dimensional Triangle-Triangle Intersection Test
|
|
// additionaly computes the segment of intersection of the two triangles if it exists.
|
|
// coplanar returns whether the triangles are coplanar,
|
|
// source and target are the endpoints of the line segment of intersection
|
|
//
|
|
// Input:
|
|
// p1,q1,r1 - vertices of the 1st triangle (3D)
|
|
// p2,q2,r2 - vertices of the 2nd triangle (3D)
|
|
//
|
|
// Output:
|
|
// coplanar - flag if two triangles are coplanar
|
|
// source - 1st point of intersection (if exists)
|
|
// target - 2nd point in intersection (if exists)
|
|
//
|
|
// Return true if two triangles intersect
|
|
template <typename DerivedP1,typename DerivedQ1,typename DerivedR1,
|
|
typename DerivedP2,typename DerivedQ2,typename DerivedR2,
|
|
typename DerivedS,typename DerivedT>
|
|
IGL_INLINE bool tri_tri_intersection_test_3d(
|
|
const Eigen::MatrixBase<DerivedP1> & p1, const Eigen::MatrixBase<DerivedQ1> & q1, const Eigen::MatrixBase<DerivedR1> & r1,
|
|
const Eigen::MatrixBase<DerivedP2> & p2, const Eigen::MatrixBase<DerivedQ2> & q2, const Eigen::MatrixBase<DerivedR2> & r2,
|
|
bool & coplanar,
|
|
Eigen::MatrixBase<DerivedS> & source,
|
|
Eigen::MatrixBase<DerivedT> & target );
|
|
|
|
|
|
|
|
// Two dimensional Triangle-Triangle Overlap Test
|
|
// Input:
|
|
// p1,q1,r1 - vertices of the 1st triangle (2D)
|
|
// p2,q2,r2 - vertices of the 2nd triangle (2D)
|
|
//
|
|
// Output:
|
|
// Return true if two triangles overlap
|
|
template <typename DerivedP1,typename DerivedQ1,typename DerivedR1,
|
|
typename DerivedP2,typename DerivedQ2,typename DerivedR2>
|
|
IGL_INLINE bool tri_tri_overlap_test_2d(
|
|
const Eigen::MatrixBase<DerivedP1> &p1, const Eigen::MatrixBase<DerivedQ1> &q1, const Eigen::MatrixBase<DerivedR1> &r1,
|
|
const Eigen::MatrixBase<DerivedP2> &p2, const Eigen::MatrixBase<DerivedQ2> &q2, const Eigen::MatrixBase<DerivedR2> &r2);
|
|
|
|
|
|
};
|
|
|
|
#ifndef IGL_STATIC_LIBRARY
|
|
# include "tri_tri_intersect.cpp"
|
|
#endif
|
|
|
|
#endif // IGL_TRI_TRI_INTERSECT_H
|