mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
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.
78 lines
2 KiB
C++
78 lines
2 KiB
C++
#ifndef SLA_HOLLOWING_HPP
|
|
#define SLA_HOLLOWING_HPP
|
|
|
|
#include <memory>
|
|
#include <libslic3r/SLA/Contour3D.hpp>
|
|
#include <libslic3r/SLA/JobController.hpp>
|
|
|
|
namespace Slic3r {
|
|
|
|
class TriangleMesh;
|
|
|
|
namespace sla {
|
|
|
|
struct HollowingConfig
|
|
{
|
|
double min_thickness = 2.;
|
|
double quality = 0.5;
|
|
double closing_distance = 0.5;
|
|
bool enabled = true;
|
|
};
|
|
|
|
struct DrainHole
|
|
{
|
|
Vec3f pos;
|
|
Vec3f normal;
|
|
float radius;
|
|
float height;
|
|
|
|
DrainHole()
|
|
: pos(Vec3f::Zero()), normal(Vec3f::UnitZ()), radius(5.f), height(10.f)
|
|
{}
|
|
|
|
DrainHole(Vec3f p, Vec3f n, float r, float h)
|
|
: pos(p), normal(n), radius(r), height(h)
|
|
{}
|
|
|
|
DrainHole(const DrainHole& rhs) :
|
|
DrainHole(rhs.pos, rhs.normal, rhs.radius, rhs.height) {}
|
|
|
|
bool operator==(const DrainHole &sp) const;
|
|
|
|
bool operator!=(const DrainHole &sp) const { return !(sp == (*this)); }
|
|
|
|
bool is_inside(const Vec3f& pt) const;
|
|
|
|
bool get_intersections(const Vec3f& s, const Vec3f& dir,
|
|
std::array<std::pair<float, Vec3d>, 2>& out) const;
|
|
|
|
Contour3D to_mesh() const;
|
|
|
|
template<class Archive> inline void serialize(Archive &ar)
|
|
{
|
|
ar(pos, normal, radius, height);
|
|
}
|
|
|
|
static constexpr size_t steps = 32;
|
|
};
|
|
|
|
using DrainHoles = std::vector<DrainHole>;
|
|
|
|
constexpr float HoleStickOutLength = 1.f;
|
|
|
|
std::unique_ptr<TriangleMesh> generate_interior(const TriangleMesh &mesh,
|
|
const HollowingConfig & = {},
|
|
const JobController &ctl = {});
|
|
|
|
void hollow_mesh(TriangleMesh &mesh, const HollowingConfig &cfg);
|
|
|
|
void cut_drainholes(std::vector<ExPolygons> & obj_slices,
|
|
const std::vector<float> &slicegrid,
|
|
float closing_radius,
|
|
const sla::DrainHoles & holes,
|
|
std::function<void(void)> thr);
|
|
|
|
}
|
|
}
|
|
|
|
#endif // HOLLOWINGFILTER_H
|