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>
391 lines
10 KiB
C++
391 lines
10 KiB
C++
|
|
#include "EmbreeIntersector.h"
|
|
|
|
// Implementation
|
|
#include "../EPS.h"
|
|
|
|
IGL_INLINE igl::embree::EmbreeIntersector::EmbreeIntersector()
|
|
:
|
|
//scene(NULL),
|
|
geomID(0),
|
|
vertices(NULL),
|
|
triangles(NULL),
|
|
initialized(false),
|
|
device(igl::embree::EmbreeDevice::get_device())
|
|
{
|
|
}
|
|
|
|
IGL_INLINE igl::embree::EmbreeIntersector::EmbreeIntersector(
|
|
const EmbreeIntersector &)
|
|
:// To make -Weffc++ happy
|
|
//scene(NULL),
|
|
geomID(0),
|
|
vertices(NULL),
|
|
triangles(NULL),
|
|
initialized(false)
|
|
{
|
|
assert(false && "Embree: Copying EmbreeIntersector is not allowed");
|
|
}
|
|
|
|
IGL_INLINE igl::embree::EmbreeIntersector & igl::embree::EmbreeIntersector::operator=(
|
|
const EmbreeIntersector &)
|
|
{
|
|
assert(false && "Embree: Assigning an EmbreeIntersector is not allowed");
|
|
return *this;
|
|
}
|
|
|
|
|
|
IGL_INLINE void igl::embree::EmbreeIntersector::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::EmbreeIntersector::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
|
|
vertices = (Vertex*)rtcSetNewGeometryBuffer(geom_0,RTC_BUFFER_TYPE_VERTEX,0,RTC_FORMAT_FLOAT3,4*sizeof(float),V[g]->rows());
|
|
for(int i=0;i<(int)V[g]->rows();i++)
|
|
{
|
|
vertices[i].x = (float)V[g]->coeff(i,0);
|
|
vertices[i].y = (float)V[g]->coeff(i,1);
|
|
vertices[i].z = (float)V[g]->coeff(i,2);
|
|
}
|
|
|
|
|
|
// fill triangle buffer
|
|
triangles = (Triangle*) rtcSetNewGeometryBuffer(geom_0,RTC_BUFFER_TYPE_INDEX,0,RTC_FORMAT_UINT3,3*sizeof(int),F[g]->rows());
|
|
for(int i=0;i<(int)F[g]->rows();i++)
|
|
{
|
|
triangles[i].v0 = (int)F[g]->coeff(i,0);
|
|
triangles[i].v1 = (int)F[g]->coeff(i,1);
|
|
triangles[i].v2 = (int)F[g]->coeff(i,2);
|
|
}
|
|
|
|
|
|
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::EmbreeIntersector
|
|
::~EmbreeIntersector()
|
|
{
|
|
if(initialized)
|
|
deinit();
|
|
igl::embree::EmbreeDevice::release_device();
|
|
}
|
|
|
|
IGL_INLINE void igl::embree::EmbreeIntersector::deinit()
|
|
{
|
|
if(device && 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::EmbreeIntersector::intersectRay(
|
|
const Eigen::RowVector3f& origin,
|
|
const Eigen::RowVector3f& direction,
|
|
Hit<float> & hit,
|
|
float tnear,
|
|
float tfar,
|
|
int mask) const
|
|
{
|
|
RTCRayHit ray; // EMBREE_FIXME: use RTCRay for occlusion rays
|
|
ray.ray.flags = 0;
|
|
createRay(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;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
IGL_INLINE bool igl::embree::EmbreeIntersector::intersectBeam(
|
|
const Eigen::RowVector3f& origin,
|
|
const Eigen::RowVector3f& direction,
|
|
Hit<float> & hit,
|
|
float tnear,
|
|
float tfar,
|
|
int mask,
|
|
int geoId,
|
|
bool closestHit,
|
|
unsigned int samples) const
|
|
{
|
|
bool hasHit = false;
|
|
Hit<float> bestHit;
|
|
|
|
if(closestHit)
|
|
bestHit.t = std::numeric_limits<float>::max();
|
|
else
|
|
bestHit.t = 0;
|
|
|
|
if((intersectRay(origin,direction,hit,tnear,tfar,mask) && (hit.gid == geoId || geoId == -1)))
|
|
{
|
|
bestHit = hit;
|
|
hasHit = true;
|
|
}
|
|
|
|
// sample points around actual ray (conservative hitcheck)
|
|
const float eps= 1e-5;
|
|
|
|
Eigen::RowVector3f up(0,1,0);
|
|
if (direction.cross(up).norm() < eps) up = Eigen::RowVector3f(1,0,0);
|
|
Eigen::RowVector3f offset = direction.cross(up).normalized();
|
|
|
|
Eigen::Matrix3f rot = Eigen::AngleAxis<float>(2*3.14159265358979/samples,direction).toRotationMatrix();
|
|
|
|
for(int r=0;r<(int)samples;r++)
|
|
{
|
|
if(intersectRay(origin+offset*eps,direction,hit,tnear,tfar,mask) &&
|
|
((closestHit && (hit.t < bestHit.t)) ||
|
|
(!closestHit && (hit.t > bestHit.t))) &&
|
|
(hit.gid == geoId || geoId == -1))
|
|
{
|
|
bestHit = hit;
|
|
hasHit = true;
|
|
}
|
|
offset = rot*offset.transpose();
|
|
}
|
|
|
|
hit = bestHit;
|
|
return hasHit;
|
|
}
|
|
|
|
IGL_INLINE bool
|
|
igl::embree::EmbreeIntersector
|
|
::intersectRay(
|
|
const Eigen::RowVector3f& origin,
|
|
const Eigen::RowVector3f& direction,
|
|
std::vector<Hit<float> > &hits,
|
|
int& num_rays,
|
|
float tnear,
|
|
float tfar,
|
|
int mask) const
|
|
{
|
|
using namespace std;
|
|
num_rays = 0;
|
|
hits.clear();
|
|
int last_id0 = -1;
|
|
double self_hits = 0;
|
|
// This epsilon is directly correleated to the number of missed hits, smaller
|
|
// means more accurate and slower
|
|
//const double eps = DOUBLE_EPS;
|
|
const double eps = FLOAT_EPS;
|
|
double min_t = tnear;
|
|
bool large_hits_warned = false;
|
|
RTCRayHit ray; // EMBREE_FIXME: use RTCRay for occlusion rays
|
|
ray.ray.flags = 0;
|
|
createRay(ray,origin,direction,tnear,tfar,mask);
|
|
|
|
while(true)
|
|
{
|
|
ray.ray.tnear = min_t;
|
|
ray.ray.tfar = tfar;
|
|
ray.hit.geomID = RTC_INVALID_GEOMETRY_ID;
|
|
ray.hit.primID = RTC_INVALID_GEOMETRY_ID;
|
|
ray.hit.instID[0] = RTC_INVALID_GEOMETRY_ID;
|
|
num_rays++;
|
|
{
|
|
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;
|
|
}
|
|
if((unsigned)ray.hit.geomID != RTC_INVALID_GEOMETRY_ID)
|
|
{
|
|
// Hit self again, progressively advance
|
|
if(ray.hit.primID == last_id0 || ray.ray.tfar <= min_t)
|
|
{
|
|
// push min_t a bit more
|
|
//double t_push = pow(2.0,self_hits-4)*(hit.t<eps?eps:hit.t);
|
|
double t_push = pow(2.0,self_hits)*eps;
|
|
#ifdef IGL_VERBOSE
|
|
std::cerr<<" t_push: "<<t_push<<endl;
|
|
#endif
|
|
//o = o+t_push*d;
|
|
min_t += t_push;
|
|
self_hits++;
|
|
}
|
|
else
|
|
{
|
|
Hit<float> hit;
|
|
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;
|
|
hits.push_back(hit);
|
|
#ifdef IGL_VERBOSE
|
|
std::cerr<<" t: "<<hit.t<<endl;
|
|
#endif
|
|
// Instead of moving origin, just change min_t. That way calculations
|
|
// all use exactly same origin values
|
|
min_t = ray.ray.tfar;
|
|
|
|
// reset t_scale
|
|
self_hits = 0;
|
|
}
|
|
last_id0 = ray.hit.primID;
|
|
}
|
|
else
|
|
break; // no more hits
|
|
|
|
if(hits.size()>1000 && !large_hits_warned)
|
|
{
|
|
std::cout<<"Warning: Large number of hits..."<<endl;
|
|
std::cout<<"[ ";
|
|
for(vector<Hit<float>>::iterator hit = hits.begin(); hit != hits.end();hit++)
|
|
{
|
|
std::cout<<(hit->id+1)<<" ";
|
|
}
|
|
|
|
std::cout.precision(std::numeric_limits< double >::digits10);
|
|
std::cout<<"[ ";
|
|
|
|
for(vector<Hit<float>>::iterator hit = hits.begin(); hit != hits.end(); hit++)
|
|
{
|
|
std::cout<<(hit->t)<<endl;;
|
|
}
|
|
|
|
std::cout<<"]"<<endl;
|
|
large_hits_warned = true;
|
|
|
|
return hits.empty();
|
|
}
|
|
}
|
|
|
|
return hits.empty();
|
|
}
|
|
|
|
IGL_INLINE bool
|
|
igl::embree::EmbreeIntersector
|
|
::intersectSegment(const Eigen::RowVector3f& a, const Eigen::RowVector3f& ab, Hit<float> &hit, int mask) const
|
|
{
|
|
RTCRayHit ray; // EMBREE_FIXME: use RTCRay for occlusion rays
|
|
ray.ray.flags = 0;
|
|
createRay(ray,a,ab,0,1.0,mask);
|
|
|
|
{
|
|
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;
|
|
}
|
|
|
|
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;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
IGL_INLINE void
|
|
igl::embree::EmbreeIntersector
|
|
::createRay(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;
|
|
}
|