mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-16 18:12:10 +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>
448 lines
12 KiB
C++
448 lines
12 KiB
C++
#include "EmbreeRenderer.h"
|
|
// Implementation
|
|
|
|
//IGL viewing parts
|
|
#include "../unproject.h"
|
|
#include "../look_at.h"
|
|
#include "../frustum.h"
|
|
#include "../ortho.h"
|
|
|
|
// color map
|
|
#include "../jet.h"
|
|
|
|
#include "../PI.h"
|
|
|
|
|
|
IGL_INLINE void igl::embree::EmbreeRenderer::init_view()
|
|
{
|
|
camera_base_zoom = 1.0f;
|
|
camera_zoom = 1.0f;
|
|
|
|
camera_view_angle = 45.0;
|
|
camera_dnear = 1.0;
|
|
camera_dfar = 100.0;
|
|
camera_base_translation << 0, 0, 0;
|
|
camera_translation << 0, 0, 0;
|
|
camera_eye << 0, 0, 5;
|
|
camera_center << 0, 0, 0;
|
|
camera_up << 0, 1, 0;
|
|
|
|
rot_matrix = Eigen::Matrix3f::Identity();
|
|
|
|
view = Eigen::Matrix4f::Identity();
|
|
proj = Eigen::Matrix4f::Identity();
|
|
norm = Eigen::Matrix4f::Identity();
|
|
|
|
orthographic = false;
|
|
|
|
|
|
}
|
|
|
|
IGL_INLINE igl::embree::EmbreeRenderer::EmbreeRenderer()
|
|
:
|
|
scene(NULL),
|
|
geomID(0),
|
|
initialized(false),
|
|
device(igl::embree::EmbreeDevice::get_device())
|
|
{
|
|
init_view();
|
|
uC << 1,0,0;
|
|
double_sided = false;
|
|
}
|
|
|
|
IGL_INLINE igl::embree::EmbreeRenderer::EmbreeRenderer(
|
|
const EmbreeRenderer &)
|
|
:// To make -Weffc++ happy
|
|
scene(NULL),
|
|
geomID(0),
|
|
initialized(false)
|
|
{
|
|
assert(false && "Embree: Copying EmbreeRenderer is not allowed");
|
|
}
|
|
|
|
IGL_INLINE igl::embree::EmbreeRenderer & igl::embree::EmbreeRenderer::operator=(
|
|
const EmbreeRenderer &)
|
|
{
|
|
assert(false && "Embree: Assigning an EmbreeRenderer is not allowed");
|
|
return *this;
|
|
}
|
|
|
|
|
|
IGL_INLINE void igl::embree::EmbreeRenderer::init(
|
|
const PointMatrixType& V,
|
|
const FaceMatrixType& F,
|
|
bool isStatic)
|
|
{
|
|
std::vector<const PointMatrixType*> Vtemp;
|
|
std::vector<const FaceMatrixType*> Ftemp;
|
|
std::vector<int> masks;
|
|
Vtemp.push_back(&V);
|
|
Ftemp.push_back(&F);
|
|
masks.push_back(0xFFFFFFFF);
|
|
init(Vtemp,Ftemp,masks,isStatic);
|
|
}
|
|
|
|
IGL_INLINE void igl::embree::EmbreeRenderer::init(
|
|
const std::vector<const PointMatrixType*>& V,
|
|
const std::vector<const FaceMatrixType*>& F,
|
|
const std::vector<int>& masks,
|
|
bool isStatic)
|
|
{
|
|
if(initialized)
|
|
deinit();
|
|
|
|
using namespace std;
|
|
|
|
if(V.size() == 0 || F.size() == 0)
|
|
{
|
|
std::cerr << "Embree: No geometry specified!";
|
|
return;
|
|
}
|
|
RTCBuildQuality buildQuality = isStatic ? RTC_BUILD_QUALITY_HIGH : RTC_BUILD_QUALITY_MEDIUM;
|
|
|
|
// create a scene
|
|
scene = rtcNewScene(device);
|
|
rtcSetSceneFlags(scene, RTC_SCENE_FLAG_ROBUST);
|
|
rtcSetSceneBuildQuality(scene, buildQuality);
|
|
|
|
for(int g=0;g<(int)V.size();g++)
|
|
{
|
|
// create triangle mesh geometry in that scene
|
|
RTCGeometry geom_0 = rtcNewGeometry (device, RTC_GEOMETRY_TYPE_TRIANGLE);
|
|
rtcSetGeometryBuildQuality(geom_0, buildQuality);
|
|
rtcSetGeometryTimeStepCount(geom_0,1);
|
|
geomID = rtcAttachGeometry(scene,geom_0);
|
|
rtcReleaseGeometry(geom_0);
|
|
|
|
// fill vertex buffer, have to be 16 byte wide( sizeof(float)*4 )
|
|
Eigen::Map<Eigen::Matrix<float,-1,4,Eigen::RowMajor>> vertices(
|
|
(float*)rtcSetNewGeometryBuffer(geom_0,RTC_BUFFER_TYPE_VERTEX,0,RTC_FORMAT_FLOAT3,4*sizeof(float),V[g]->rows()),
|
|
V[g]->rows(),4
|
|
);
|
|
vertices.block(0,0,V[g]->rows(),3) = V[g]->cast<float>();
|
|
|
|
// fill triangle buffer
|
|
Eigen::Map<Eigen::Matrix<unsigned int,-1,3,Eigen::RowMajor>> triangles(
|
|
(unsigned int*) rtcSetNewGeometryBuffer(geom_0,RTC_BUFFER_TYPE_INDEX,0,RTC_FORMAT_UINT3,3*sizeof(unsigned int), F[g]->rows()),
|
|
F[g]->rows(),3
|
|
);
|
|
triangles = F[g]->cast<unsigned int>();
|
|
//TODO: store vertices and triangles in array for whatever reason?
|
|
|
|
rtcSetGeometryMask(geom_0, masks[g]);
|
|
rtcCommitGeometry(geom_0);
|
|
}
|
|
|
|
rtcCommitScene(scene);
|
|
|
|
if(rtcGetDeviceError (device) != RTC_ERROR_NONE)
|
|
std::cerr << "Embree: An error occurred while initializing the provided geometry!" << endl;
|
|
#ifdef IGL_VERBOSE
|
|
else
|
|
std::cerr << "Embree: geometry added." << endl;
|
|
#endif
|
|
|
|
initialized = true;
|
|
}
|
|
|
|
IGL_INLINE igl::embree::EmbreeRenderer::~EmbreeRenderer()
|
|
{
|
|
if(initialized)
|
|
deinit();
|
|
|
|
igl::embree::EmbreeDevice::release_device();
|
|
}
|
|
|
|
IGL_INLINE void igl::embree::EmbreeRenderer::deinit()
|
|
{
|
|
if(scene)
|
|
{
|
|
rtcReleaseScene(scene);
|
|
|
|
if(rtcGetDeviceError (device) != RTC_ERROR_NONE)
|
|
{
|
|
std::cerr << "Embree: An error occurred while resetting!" << std::endl;
|
|
}
|
|
#ifdef IGL_VERBOSE
|
|
else
|
|
{
|
|
std::cerr << "Embree: geometry removed." << std::endl;
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
|
|
IGL_INLINE bool igl::embree::EmbreeRenderer::intersect_ray(
|
|
const Eigen::RowVector3f& origin,
|
|
const Eigen::RowVector3f& direction,
|
|
Hit & hit,
|
|
float tnear,
|
|
float tfar,
|
|
int mask) const
|
|
{
|
|
RTCRayHit ray;
|
|
ray.ray.flags = 0;
|
|
create_ray(ray, origin,direction,tnear,tfar,mask);
|
|
|
|
// shot ray
|
|
{
|
|
rtcIntersect1(scene,&ray);
|
|
ray.hit.Ng_x = -ray.hit.Ng_x; // EMBREE_FIXME: only correct for triangles,quads, and subdivision surfaces
|
|
ray.hit.Ng_y = -ray.hit.Ng_y;
|
|
ray.hit.Ng_z = -ray.hit.Ng_z;
|
|
}
|
|
#ifdef IGL_VERBOSE
|
|
if(rtcGetDeviceError (device) != RTC_ERROR_NONE)
|
|
std::cerr << "Embree: An error occurred while resetting!" << std::endl;
|
|
#endif
|
|
|
|
if((unsigned)ray.hit.geomID != RTC_INVALID_GEOMETRY_ID)
|
|
{
|
|
hit.id = ray.hit.primID;
|
|
hit.gid = ray.hit.geomID;
|
|
hit.u = ray.hit.u;
|
|
hit.v = ray.hit.v;
|
|
hit.t = ray.ray.tfar;
|
|
hit.N = Vec3f(ray.hit.Ng_x, ray.hit.Ng_y, ray.hit.Ng_z);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer
|
|
::create_ray(RTCRayHit& ray, const Eigen::RowVector3f& origin,
|
|
const Eigen::RowVector3f& direction, float tnear, float tfar, int mask) const
|
|
{
|
|
ray.ray.org_x = origin[0];
|
|
ray.ray.org_y = origin[1];
|
|
ray.ray.org_z = origin[2];
|
|
ray.ray.dir_x = direction[0];
|
|
ray.ray.dir_y = direction[1];
|
|
ray.ray.dir_z = direction[2];
|
|
ray.ray.tnear = tnear;
|
|
ray.ray.tfar = tfar;
|
|
ray.ray.id = RTC_INVALID_GEOMETRY_ID;
|
|
ray.ray.mask = mask;
|
|
ray.ray.time = 0.0f;
|
|
|
|
ray.hit.geomID = RTC_INVALID_GEOMETRY_ID;
|
|
ray.hit.instID[0] = RTC_INVALID_GEOMETRY_ID;
|
|
ray.hit.primID = RTC_INVALID_GEOMETRY_ID;
|
|
}
|
|
|
|
|
|
template <typename DerivedV, typename DerivedF>
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer
|
|
::set_mesh(const Eigen::MatrixBase<DerivedV> & MV,
|
|
const Eigen::MatrixBase<DerivedF> & MF,
|
|
bool is_static)
|
|
{
|
|
V = MV.template cast<float>();
|
|
F = MF;
|
|
this->init(V,F,is_static);
|
|
|
|
auto min_point = V.colwise().minCoeff();
|
|
auto max_point = V.colwise().maxCoeff();
|
|
auto centroid = (0.5*(min_point + max_point)).eval();
|
|
|
|
camera_base_translation.setConstant(0);
|
|
camera_base_translation.head(centroid.size()) = -centroid.cast<float>();
|
|
camera_base_zoom = 2.0 / (max_point-min_point).array().abs().maxCoeff();
|
|
}
|
|
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer
|
|
::render_buffer(PixelMatrixType& R, PixelMatrixType&G, PixelMatrixType &B,PixelMatrixType &A)
|
|
{
|
|
assert(R.rows()==G.rows());assert(R.rows()==B.rows());assert(R.rows()==A.rows());
|
|
assert(R.cols()==G.cols());assert(R.cols()==B.cols());assert(R.cols()==A.cols());
|
|
|
|
Eigen::Vector4f viewport(0,0,R.rows(),R.cols());
|
|
|
|
float width = R.rows();
|
|
float height = R.cols();
|
|
|
|
// update view matrix
|
|
igl::look_at( camera_eye, camera_center, camera_up, view);
|
|
|
|
view = view
|
|
* (rot_matrix * Eigen::Scaling(camera_zoom * camera_base_zoom)
|
|
* Eigen::Translation3f(camera_translation + camera_base_translation)).matrix();
|
|
|
|
if (orthographic)
|
|
{
|
|
float length = (camera_eye - camera_center).norm();
|
|
float h = tan(camera_view_angle/360.0 * igl::PI) * (length);
|
|
igl::ortho(-h*width/height, h*width/height, -h, h, camera_dnear, camera_dfar, proj);
|
|
} else {
|
|
float fH = tan(camera_view_angle / 360.0 * igl::PI) * camera_dnear;
|
|
float fW = fH * (double)width/(double)height;
|
|
igl::frustum(-fW, fW, -fH, fH, camera_dnear, camera_dfar, proj);
|
|
}
|
|
|
|
// go over all pixels in the "view"
|
|
for(int x=0;x<(int)width;++x)
|
|
{
|
|
for(int y=0;y<(int)height;++y)
|
|
{
|
|
Vec3f s,d,dir;
|
|
igl::embree::EmbreeRenderer::Hit hit;
|
|
|
|
// look into the screen
|
|
Vec3f win_s(x,y,0);
|
|
Vec3f win_d(x,y,1);
|
|
// Source, destination and direction in world
|
|
igl::unproject(win_s,this->view,this->proj,viewport,s);
|
|
igl::unproject(win_d,this->view,this->proj,viewport,d);
|
|
dir = d-s;
|
|
dir.normalize();
|
|
|
|
auto clamp=[](float x)->unsigned char {return (unsigned char)(x<0?0:x>1.0?255:x*255);};
|
|
|
|
if(this->intersect_ray(s,dir,hit))
|
|
{
|
|
if ( double_sided || dir.dot(hit.N) > 0.0f )
|
|
{
|
|
// TODO: interpolate normals ?
|
|
hit.N.normalize();
|
|
|
|
// cos between ray and face normal
|
|
// negative projection will indicate back side
|
|
float face_proj = fabs(dir.dot(hit.N));
|
|
|
|
Eigen::RowVector3f c;
|
|
|
|
if(this->uniform_color)
|
|
{
|
|
// same color for the whole mesh
|
|
c=this->uC;
|
|
} else if(this->face_based) {
|
|
// flat color per face
|
|
c=this->C.row(hit.id);
|
|
} else { //use barycentric coordinates to interpolate colour
|
|
c=this->C.row(F(hit.id,1))*hit.u+
|
|
this->C.row(F(hit.id,2))*hit.v+
|
|
this->C.row(F(hit.id,0))*(1.0-hit.u-hit.v);
|
|
}
|
|
|
|
R(x,y) = clamp(face_proj*c(0));
|
|
G(x,y) = clamp(face_proj*c(1));
|
|
B(x,y) = clamp(face_proj*c(2));
|
|
} else {
|
|
// backface?
|
|
R(x,y)=0;
|
|
G(x,y)=0;
|
|
B(x,y)=0;
|
|
}
|
|
// give the same alpha to all points with something behind
|
|
A(x,y)=255;
|
|
} else {
|
|
R(x,y)=0;
|
|
G(x,y)=0;
|
|
B(x,y)=0;
|
|
A(x,y)=0;
|
|
}
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
template <typename DerivedC>
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer
|
|
::set_colors(const Eigen::MatrixBase<DerivedC> & C)
|
|
{
|
|
if(C.rows()==V.rows()) // per vertex color
|
|
{
|
|
face_based = false;
|
|
this->C = C.template cast<float>();
|
|
this->uniform_color=false;
|
|
} else if (C.rows()==F.rows()) {
|
|
face_based = true;
|
|
this->C = C.template cast<float>();
|
|
this->uniform_color=false;
|
|
} else if (C.rows()==1) {
|
|
face_based = true;
|
|
this->uC = C.template cast<float>();
|
|
this->uniform_color=true;
|
|
}else {
|
|
// don't know what to do
|
|
this->uniform_color=true;
|
|
assert(false); //?
|
|
}
|
|
}
|
|
|
|
template <typename DerivedD>
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer
|
|
::set_data(const Eigen::MatrixBase<DerivedD> & D, igl::ColorMapType cmap)
|
|
{
|
|
const auto caxis_min = D.minCoeff();
|
|
const auto caxis_max = D.maxCoeff();
|
|
return set_data(D,caxis_min,caxis_max,cmap);
|
|
}
|
|
|
|
|
|
template <typename DerivedD, typename T>
|
|
IGL_INLINE void igl::embree::EmbreeRenderer::set_data(
|
|
const Eigen::MatrixBase<DerivedD> & D,
|
|
T caxis_min,
|
|
T caxis_max,
|
|
igl::ColorMapType cmap)
|
|
{
|
|
Eigen::Matrix<T, -1, -1> C;
|
|
igl::colormap(cmap,D,caxis_min,caxis_max,C);
|
|
set_colors(C);
|
|
}
|
|
|
|
template <typename Derivedr>
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer::set_rot(const Eigen::MatrixBase<Derivedr> &r)
|
|
{
|
|
this->rot_matrix = r.template cast<float>();
|
|
}
|
|
|
|
template <typename T>
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer::set_zoom(T zoom)
|
|
{
|
|
this->camera_zoom=zoom;
|
|
}
|
|
|
|
template <typename Derivedtr>
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer::set_translation(const Eigen::MatrixBase<Derivedtr> &tr)
|
|
{
|
|
this->camera_translation=tr.template cast<float>();
|
|
}
|
|
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer::set_face_based(bool _f)
|
|
{
|
|
this->face_based=_f;
|
|
}
|
|
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer::set_orthographic(bool o)
|
|
{
|
|
this->orthographic=o;
|
|
}
|
|
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeRenderer::set_double_sided(bool d)
|
|
{
|
|
this->double_sided=d;
|
|
}
|
|
|
|
|
|
#ifdef IGL_STATIC_LIBRARY
|
|
template void igl::embree::EmbreeRenderer::set_rot<Eigen::Matrix<double, 3, 3, 0, 3, 3> >(Eigen::MatrixBase<Eigen::Matrix<double, 3, 3, 0, 3, 3> > const&);
|
|
template void igl::embree::EmbreeRenderer::set_data<Eigen::Matrix<double, -1, 1, 0, -1, 1> >(Eigen::MatrixBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> > const&, igl::ColorMapType);
|
|
template void igl::embree::EmbreeRenderer::set_mesh<Eigen::Matrix<double, -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&, bool);
|
|
template void igl::embree::EmbreeRenderer::set_zoom<double>(double);
|
|
#endif //IGL_STATIC_LIBRARY
|