mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-16 18:12:10 +00:00
239d588c5d
limited anchors, while before a full perimeter segment was always taken if possible. 2) Adapted the line infills (grid, stars, triangles, cubic) to 1). This also solves a long standing issue of these infills producing anchors for each sweep direction independently, thus possibly overlapping and overextruding, which was quite detrimental in narrow areas. 3) Refactored cubic adaptive infill anchroing algorithm for performance and clarity.
93 lines
3.0 KiB
C++
93 lines
3.0 KiB
C++
#ifndef slic3r_FillRectilinear2_hpp_
|
|
#define slic3r_FillRectilinear2_hpp_
|
|
|
|
#include "../libslic3r.h"
|
|
|
|
#include "FillBase.hpp"
|
|
|
|
namespace Slic3r {
|
|
|
|
class Surface;
|
|
|
|
class FillRectilinear2 : public Fill
|
|
{
|
|
public:
|
|
virtual Fill* clone() const { return new FillRectilinear2(*this); };
|
|
virtual ~FillRectilinear2() = default;
|
|
virtual Polylines fill_surface(const Surface *surface, const FillParams ¶ms);
|
|
|
|
protected:
|
|
// Fill by single directional lines, interconnect the lines along perimeters.
|
|
bool fill_surface_by_lines(const Surface *surface, const FillParams ¶ms, float angleBase, float pattern_shift, Polylines &polylines_out);
|
|
|
|
|
|
// Fill by multiple sweeps of differing directions.
|
|
struct SweepParams {
|
|
float angle_base;
|
|
float pattern_shift;
|
|
};
|
|
bool fill_surface_by_multilines(const Surface *surface, FillParams params, const std::initializer_list<SweepParams> &sweep_params, Polylines &polylines_out);
|
|
};
|
|
|
|
class FillMonotonic : public FillRectilinear2
|
|
{
|
|
public:
|
|
virtual Fill* clone() const { return new FillMonotonic(*this); };
|
|
virtual ~FillMonotonic() = default;
|
|
virtual Polylines fill_surface(const Surface *surface, const FillParams ¶ms);
|
|
virtual bool no_sort() const { return true; }
|
|
};
|
|
|
|
class FillGrid2 : public FillRectilinear2
|
|
{
|
|
public:
|
|
virtual Fill* clone() const { return new FillGrid2(*this); };
|
|
virtual ~FillGrid2() = default;
|
|
virtual Polylines fill_surface(const Surface *surface, const FillParams ¶ms);
|
|
|
|
protected:
|
|
// The grid fill will keep the angle constant between the layers, see the implementation of Slic3r::Fill.
|
|
virtual float _layer_angle(size_t idx) const { return 0.f; }
|
|
};
|
|
|
|
class FillTriangles : public FillRectilinear2
|
|
{
|
|
public:
|
|
virtual Fill* clone() const { return new FillTriangles(*this); };
|
|
virtual ~FillTriangles() = default;
|
|
virtual Polylines fill_surface(const Surface *surface, const FillParams ¶ms);
|
|
|
|
protected:
|
|
// The grid fill will keep the angle constant between the layers, see the implementation of Slic3r::Fill.
|
|
virtual float _layer_angle(size_t idx) const { return 0.f; }
|
|
};
|
|
|
|
class FillStars : public FillRectilinear2
|
|
{
|
|
public:
|
|
virtual Fill* clone() const { return new FillStars(*this); };
|
|
virtual ~FillStars() = default;
|
|
virtual Polylines fill_surface(const Surface *surface, const FillParams ¶ms);
|
|
|
|
protected:
|
|
// The grid fill will keep the angle constant between the layers, see the implementation of Slic3r::Fill.
|
|
virtual float _layer_angle(size_t idx) const { return 0.f; }
|
|
};
|
|
|
|
class FillCubic : public FillRectilinear2
|
|
{
|
|
public:
|
|
virtual Fill* clone() const { return new FillCubic(*this); };
|
|
virtual ~FillCubic() = default;
|
|
virtual Polylines fill_surface(const Surface *surface, const FillParams ¶ms);
|
|
|
|
protected:
|
|
// The grid fill will keep the angle constant between the layers, see the implementation of Slic3r::Fill.
|
|
virtual float _layer_angle(size_t idx) const { return 0.f; }
|
|
};
|
|
|
|
|
|
}; // namespace Slic3r
|
|
|
|
#endif // slic3r_FillRectilinear2_hpp_
|