a95509ce36
Drain holes reference position was saved slightly above the mesh to avoid problem when the hole is placed on flat or nearly flat surface The depth of the hole was internally bigger than what the user has set to compensato for it However, this leads to problem with scaling and makes reprojection of the holes on the mesh complicated This commit changes the reference point to the point on the mesh and the extra elevation is handled when rendering and drilling the hole. The change is reflected in 3MF drain holes versioning so that old 3MFs are loaded correctly. Reprojection on the mesh after reload from disk/fix through netfabb has been enabled.
48 lines
1.3 KiB
C++
48 lines
1.3 KiB
C++
#ifndef REPROJECTPOINTSONMESH_HPP
|
|
#define REPROJECTPOINTSONMESH_HPP
|
|
|
|
#include "libslic3r/Point.hpp"
|
|
#include "SupportPoint.hpp"
|
|
#include "Hollowing.hpp"
|
|
#include "IndexedMesh.hpp"
|
|
#include "libslic3r/Model.hpp"
|
|
|
|
#include <tbb/parallel_for.h>
|
|
|
|
namespace Slic3r { namespace sla {
|
|
|
|
template<class Pt> Vec3d pos(const Pt &p) { return p.pos.template cast<double>(); }
|
|
template<class Pt> void pos(Pt &p, const Vec3d &pp) { p.pos = pp.cast<float>(); }
|
|
|
|
template<class PointType>
|
|
void reproject_support_points(const IndexedMesh &mesh, std::vector<PointType> &pts)
|
|
{
|
|
tbb::parallel_for(size_t(0), pts.size(), [&mesh, &pts](size_t idx) {
|
|
int junk;
|
|
Vec3d new_pos;
|
|
mesh.squared_distance(pos(pts[idx]), junk, new_pos);
|
|
pos(pts[idx], new_pos);
|
|
});
|
|
}
|
|
|
|
inline void reproject_points_and_holes(ModelObject *object)
|
|
{
|
|
bool has_sppoints = !object->sla_support_points.empty();
|
|
bool has_holes = !object->sla_drain_holes.empty();
|
|
|
|
if (!object || (!has_holes && !has_sppoints)) return;
|
|
|
|
TriangleMesh rmsh = object->raw_mesh();
|
|
rmsh.require_shared_vertices();
|
|
IndexedMesh emesh{rmsh};
|
|
|
|
if (has_sppoints)
|
|
reproject_support_points(emesh, object->sla_support_points);
|
|
|
|
if (has_holes)
|
|
reproject_support_points(emesh, object->sla_drain_holes);
|
|
}
|
|
|
|
}}
|
|
#endif // REPROJECTPOINTSONMESH_HPP
|