3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 17:27:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixing many errors caused by the new changes.

Browse source
This commit is contained in:
tamasmeszaros 2019-03-01 17:45:29 +01:00
parent 450f817c09
commit 878ac7f1b0
3 changed files with 65 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libslic3r/SLA/SLACommon.hpp
View file

@ -72,30 +72,36 @@ public:
class hit_result {
double m_t = std::nan("");
int m_face_id = -1;
std::reference_wrapper<const EigenMesh3D> m_mesh;
const EigenMesh3D *m_mesh = nullptr;
Vec3d m_dir;
Vec3d m_source;
friend class EigenMesh3D;
public:
// A valid object of this class can only be obtained from
// EigenMesh3D::query_ray_hit method.
explicit inline hit_result(const EigenMesh3D& em): m_mesh(em) {}
explicit inline hit_result(const EigenMesh3D& em): m_mesh(&em) {}
public:
// This can create a placeholder object which is invalid (not created
// by a query_ray_hit call) but the distance can be preset to
// a specific value for distinguishing the placeholder.
inline hit_result(double val = std::nan("")): m_t(val) {}
inline double distance() const { return m_t; }
inline const Vec3d& direction() const { return m_dir; }
inline Vec3d position() const { return m_source + m_dir * m_t; }
inline int face() const { return m_face_id; }
inline bool is_valid() const { return m_mesh != nullptr; }
// Hit_result can decay into a double as the hit distance.
inline operator double() const { return distance(); }
inline Vec3d normal() const {
if(m_face_id < 0) return {};
auto trindex = m_mesh.get().m_F.row(m_face_id);
const Vec3d& p1 = m_mesh.get().V().row(trindex(0));
const Vec3d& p2 = m_mesh.get().V().row(trindex(1));
const Vec3d& p3 = m_mesh.get().V().row(trindex(2));
if(m_face_id < 0 || !is_valid()) return {};
auto trindex = m_mesh->m_F.row(m_face_id);
const Vec3d& p1 = m_mesh->V().row(trindex(0));
const Vec3d& p2 = m_mesh->V().row(trindex(1));
const Vec3d& p3 = m_mesh->V().row(trindex(2));
Eigen::Vector3d U = p2 - p1;
Eigen::Vector3d V = p3 - p1;
return U.cross(V).normalized();