mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-17 02:22:17 +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>
263 lines
7.9 KiB
C++
263 lines
7.9 KiB
C++
// This file is part of libigl, a simple c++ geometry processing library.
|
|
//
|
|
//
|
|
// Copyright (C) 2020 Vladimir Fonov <vladimir.fonov@gmail.com>
|
|
// 2013 Alec Jacobson <alecjacobson@gmail.com>
|
|
// 2014 Christian Schüller <schuellchr@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_EMBREE_EMBREE_RENDERER_H
|
|
#define IGL_EMBREE_EMBREE_RENDERER_H
|
|
|
|
#include "../colormap.h"
|
|
|
|
#include <Eigen/Geometry>
|
|
#include <Eigen/Core>
|
|
#include <Eigen/Geometry>
|
|
|
|
#include <embree4/rtcore.h>
|
|
#include <embree4/rtcore_ray.h>
|
|
#include <iostream>
|
|
#include <vector>
|
|
|
|
#include "EmbreeDevice.h"
|
|
|
|
|
|
namespace igl
|
|
{
|
|
namespace embree
|
|
{
|
|
/// @private
|
|
/// embree-based mesh renderer
|
|
class EmbreeRenderer
|
|
{
|
|
public:
|
|
typedef Eigen::RowVector3f Vec3f;
|
|
|
|
struct Hit
|
|
{
|
|
int id; // primitive id
|
|
int gid; // geometry id
|
|
float u,v; // barycentric coordinates
|
|
float t; // distance = direction*t to intersection
|
|
Vec3f N; // element normal
|
|
};
|
|
|
|
public:
|
|
typedef Eigen::Matrix<float,Eigen::Dynamic,3> PointMatrixType;
|
|
typedef Eigen::Matrix<float,Eigen::Dynamic,3> ColorMatrixType;
|
|
typedef Eigen::Matrix<int, Eigen::Dynamic,3> FaceMatrixType;
|
|
typedef Eigen::Matrix<unsigned char,Eigen::Dynamic,Eigen::Dynamic> PixelMatrixType;
|
|
|
|
public:
|
|
EmbreeRenderer();
|
|
private:
|
|
// Copying and assignment are not allowed.
|
|
EmbreeRenderer(const EmbreeRenderer & that);
|
|
EmbreeRenderer & operator=(const EmbreeRenderer &);
|
|
public:
|
|
virtual ~EmbreeRenderer();
|
|
|
|
// Specify mesh, this call reinitializes embree structures
|
|
// Inputs:
|
|
// V #V x dim matrix of vertex coordinates
|
|
// F #F x simplex_size matrix of indices of simplex corners into V
|
|
// is_static - optimize for static thene (HQ rendering)
|
|
template <typename DerivedV, typename DerivedF>
|
|
void set_mesh(const Eigen::MatrixBase<DerivedV> & V,
|
|
const Eigen::MatrixBase<DerivedF> & F,
|
|
bool is_static=true);
|
|
|
|
// Specify per-vertex or per-face color
|
|
// Inputs:
|
|
// C #V x 3 matrix of vertex colors
|
|
// or #F x 3 matrix of face colors
|
|
// or 1 x 3 matrix of uniform color
|
|
template <typename DerivedC>
|
|
void set_colors(const Eigen::MatrixBase<DerivedC> & C);
|
|
|
|
// Use min(D) and max(D) to set caxis.
|
|
template <typename DerivedD>
|
|
void set_data(const Eigen::MatrixBase<DerivedD> & D,
|
|
igl::ColorMapType cmap = igl::COLOR_MAP_TYPE_VIRIDIS);
|
|
|
|
// Specify per-vertex or per-face scalar field
|
|
// that will be converted to color using jet color map
|
|
// Inputs:
|
|
// caxis_min caxis minimum bound
|
|
// caxis_max caxis maximum bound
|
|
// D #V by 1 list of scalar values
|
|
// cmap colormap type
|
|
// num_steps number of intervals to discretize the colormap
|
|
template <typename DerivedD, typename T>
|
|
void set_data(
|
|
const Eigen::MatrixBase<DerivedD> & D,
|
|
T caxis_min,
|
|
T caxis_max,
|
|
igl::ColorMapType cmap = igl::COLOR_MAP_TYPE_VIRIDIS);
|
|
|
|
// Specify mesh rotation
|
|
// Inputs:
|
|
// r 3 x 3 rotaton matrix
|
|
template <typename Derivedr>
|
|
void set_rot(const Eigen::MatrixBase<Derivedr> &r);
|
|
|
|
// Specify mesh magnification
|
|
// Inputs:
|
|
// z magnification ratio
|
|
template <typename T>
|
|
void set_zoom(T z);
|
|
|
|
// Specify mesh translation
|
|
// Inputs:
|
|
// tr translation vector
|
|
template <typename Derivedtr>
|
|
void set_translation(const Eigen::MatrixBase<Derivedtr> &tr);
|
|
|
|
// Specify that color is face based
|
|
// Inputs:
|
|
// f - face or vertex colours
|
|
void set_face_based(bool f);
|
|
|
|
// Use orthographic projection
|
|
// Inputs:
|
|
// f - orthographic or perspective projection
|
|
void set_orthographic(bool f );
|
|
|
|
|
|
// Render both sides of triangles
|
|
// Inputs:
|
|
// f - double sided
|
|
void set_double_sided(bool f);
|
|
|
|
// render full buffer
|
|
// Outputs:
|
|
// all outputs should have the same size (size of the output picture)
|
|
// area outside of the visible object will have zero alpha component (transparant)
|
|
// R - red channel
|
|
// G - green channel
|
|
// B - blue channel
|
|
// A - alpha channel
|
|
void render_buffer(PixelMatrixType &R,
|
|
PixelMatrixType &G,
|
|
PixelMatrixType &B,
|
|
PixelMatrixType &A);
|
|
|
|
// Given a ray find the first hit
|
|
//
|
|
// Inputs:
|
|
// origin 3d origin point of ray
|
|
// direction 3d (not necessarily normalized) direction vector of ray
|
|
// tnear start of ray segment
|
|
// tfar end of ray segment
|
|
// mask a 32 bit mask to identify active geometries.
|
|
// Output:
|
|
// hit information about hit
|
|
// Returns true if and only if there was a hit
|
|
bool intersect_ray(
|
|
const Eigen::RowVector3f& origin,
|
|
const Eigen::RowVector3f& direction,
|
|
Hit & hit,
|
|
float tnear = 0,
|
|
float tfar = std::numeric_limits<float>::infinity(),
|
|
int mask = 0xFFFFFFFF) const;
|
|
|
|
private:
|
|
|
|
// Initialize with a given mesh.
|
|
//
|
|
// Inputs:
|
|
// V #V by 3 list of vertex positions
|
|
// F #F by 3 list of Oriented triangles
|
|
// isStatic scene is optimized for static geometry
|
|
// Side effects:
|
|
// The first time this is ever called the embree engine is initialized.
|
|
void init(
|
|
const PointMatrixType& V,
|
|
const FaceMatrixType& F,
|
|
bool isStatic = false);
|
|
|
|
// Initialize embree with a given mesh.
|
|
//
|
|
// Inputs:
|
|
// V vector of #V by 3 list of vertex positions for each geometry
|
|
// F vector of #F by 3 list of Oriented triangles for each geometry
|
|
// masks a 32 bit mask to identify active geometries.
|
|
// isStatic scene is optimized for static geometry
|
|
// Side effects:
|
|
// The first time this is ever called the embree engine is initialized.
|
|
void init(
|
|
const std::vector<const PointMatrixType*>& V,
|
|
const std::vector<const FaceMatrixType*>& F,
|
|
const std::vector<int>& masks,
|
|
bool isStatic = false);
|
|
|
|
|
|
// Deinitialize embree datasctructures for current mesh. Also called on
|
|
// destruction: no need to call if you just want to init() once and
|
|
// destroy.
|
|
void deinit();
|
|
// initialize view parameters
|
|
void init_view();
|
|
|
|
// scene data
|
|
PointMatrixType V; // vertices
|
|
FaceMatrixType F; // faces
|
|
ColorMatrixType C; // colours
|
|
|
|
Eigen::RowVector3f uC; // uniform color
|
|
|
|
bool face_based;
|
|
bool uniform_color;
|
|
bool double_sided ;
|
|
|
|
// Camera parameters
|
|
float camera_base_zoom;
|
|
float camera_zoom;
|
|
|
|
Eigen::Vector3f camera_base_translation;
|
|
Eigen::Vector3f camera_translation;
|
|
Eigen::Vector3f camera_eye;
|
|
Eigen::Vector3f camera_up;
|
|
Eigen::Vector3f camera_center;
|
|
float camera_view_angle;
|
|
float camera_dnear;
|
|
float camera_dfar;
|
|
|
|
// projection matrixes
|
|
Eigen::Matrix4f view;
|
|
Eigen::Matrix4f proj;
|
|
Eigen::Matrix4f norm;
|
|
|
|
Eigen::Matrix3f rot_matrix;
|
|
|
|
bool orthographic;
|
|
|
|
// embree data
|
|
RTCScene scene;
|
|
unsigned geomID;
|
|
bool initialized;
|
|
|
|
RTCDevice device;
|
|
|
|
void create_ray(
|
|
RTCRayHit& ray,
|
|
const Eigen::RowVector3f& origin,
|
|
const Eigen::RowVector3f& direction,
|
|
float tnear,
|
|
float tfar,
|
|
int mask) const;
|
|
|
|
};
|
|
}
|
|
}
|
|
|
|
#ifndef IGL_STATIC_LIBRARY
|
|
# include "EmbreeRenderer.cpp"
|
|
#endif
|
|
#endif //IGL_EMBREE_EMBREE_RENDERER_H
|