diff options
author | Lukas Matena <lukasmatena@seznam.cz> | 2019-11-08 22:18:14 +0300 |
---|---|---|
committer | Lukas Matena <lukasmatena@seznam.cz> | 2019-11-08 22:18:14 +0300 |
commit | b4795e12920ea8f20b796a1f9b3d068b53a03c6f (patch) | |
tree | b9015f101ddaf695c5fc2d763b4341cfd8ec2447 /src/slic3r/GUI/MeshUtils.hpp | |
parent | 645f13a0ae7eb606e8a745eddbad864b7c28c46d (diff) |
Unified igl calls in MeshRaycaster and EigenMesh3D
MeshRaycaster is still aware of the clipping plane but it now uses EigenMesh3D internally
Public interface of both classes is unchanged
Diffstat (limited to 'src/slic3r/GUI/MeshUtils.hpp')
-rw-r--r-- | src/slic3r/GUI/MeshUtils.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/slic3r/GUI/MeshUtils.hpp b/src/slic3r/GUI/MeshUtils.hpp index e4c4c20d2..8dae2a2f0 100644 --- a/src/slic3r/GUI/MeshUtils.hpp +++ b/src/slic3r/GUI/MeshUtils.hpp @@ -3,6 +3,7 @@ #include "libslic3r/Point.hpp" #include "libslic3r/Geometry.hpp" +#include "libslic3r/SLA/SLACommon.hpp" #include <cfloat> @@ -93,8 +94,9 @@ private: class MeshRaycaster { public: - MeshRaycaster(const TriangleMesh& mesh); - ~MeshRaycaster(); + MeshRaycaster(const TriangleMesh& mesh) + : m_mesh(&mesh), m_emesh(mesh) + {} void set_transformation(const Geometry::Transformation& trafo); void set_camera(const Camera& camera); @@ -107,9 +109,7 @@ public: Vec3f get_closest_point(const Vec3f& point, Vec3f* normal = nullptr) const; private: - // PIMPL wrapper around igl::AABB so I don't have to include the header-only IGL here - class AABBWrapper; - AABBWrapper* m_AABB_wrapper; + sla::EigenMesh3D m_emesh; const TriangleMesh* m_mesh = nullptr; }; |