amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Trying to bypass igl in 32 bit MSVC

Browse source
This commit is contained in:
tamasmeszaros 2018-11-08 17:15:10 +01:00
parent 4a2da3d443
commit dbf6ddd344
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libslic3r/SLA/SLASupportTreeIGL.cpp
View file

@ -9,7 +9,15 @@
#include "boost/geometry/index/rtree.hpp" #include "boost/geometry/index/rtree.hpp"
#include <igl/ray_mesh_intersect.h> #include <igl/ray_mesh_intersect.h>
#if !defined(_MSC_VER) || defined(_WIN64)
#define IGL_COMPATIBLE
#endif
#ifdef IGL_COMPATIBLE
#include <igl/point_mesh_squared_distance.h> #include <igl/point_mesh_squared_distance.h>
#endif
#include "SLASpatIndex.hpp" #include "SLASpatIndex.hpp"
#include "ClipperUtils.hpp" #include "ClipperUtils.hpp"
@ -78,9 +86,11 @@ size_t SpatIndex::size() const
PointSet normals(const PointSet& points, const EigenMesh3D& mesh) { PointSet normals(const PointSet& points, const EigenMesh3D& mesh) {
// Eigen::VectorXd dists; // Eigen::VectorXd dists;
// Eigen::VectorXi I; // Eigen::VectorXi I;
#ifdef IGL_COMPATIBLE
Eigen::Matrix<double, Eigen::Dynamic, 1, Eigen::DontAlign> dists; Eigen::Matrix<double, Eigen::Dynamic, 1, Eigen::DontAlign> dists;
Eigen::Matrix<int, Eigen::Dynamic, 1, Eigen::DontAlign> I; Eigen::Matrix<int, Eigen::Dynamic, 1, Eigen::DontAlign> I;
PointSet C; PointSet C;
igl::point_mesh_squared_distance( points, mesh.V, mesh.F, dists, I, C); igl::point_mesh_squared_distance( points, mesh.V, mesh.F, dists, I, C);
PointSet ret(I.rows(), 3); PointSet ret(I.rows(), 3);
@ -98,6 +108,9 @@ PointSet normals(const PointSet& points, const EigenMesh3D& mesh) {
} }
return ret; return ret;
#else
return {};
#endif
} }
double ray_mesh_intersect(const Vec3d& s, double ray_mesh_intersect(const Vec3d& s,