GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 07:55:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix fill (override keyword added to avoid this bug in the future)

Browse Source
This commit is contained in:
supermerill 2019-12-12 14:31:40 +01:00
parent 9191ef8e78
commit 9e2b819880
14 changed files with 89 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libslic3r/Fill/Fill3DHoneycomb.cpp
View File

@ -6,6 +6,7 @@
namespace Slic3r {
/*
Creates a contiguous sequence of points at a specified height that make
up a horizontal slice of the edges of a space filling truncated
@ -138,7 +139,7 @@ void Fill3DHoneycomb::_fill_surface_single(
unsigned int thickness_layers,
const std::pair<float, Point> &direction,
ExPolygon &expolygon,
Polylines &polylines_out)
Polylines &polylines_out) const
{
// no rotation is supported for this infill pattern
BoundingBox bb = expolygon.contour.bounding_box();

2
src/libslic3r/Fill/Fill3DHoneycomb.hpp
View File

@ -21,7 +21,7 @@ protected:
unsigned int thickness_layers,
const std::pair<float, Point> &direction,
ExPolygon &expolygon,
Polylines &polylines_out);
Polylines &polylines_out) const override;
};
} // namespace Slic3r

6
src/libslic3r/Fill/FillBase.hpp
View File

@ -7,6 +7,7 @@
#include <stdint.h>
#include <type_traits>
#include <boost/log/trivial.hpp>
#include "../libslic3r.h"
#include "../BoundingBox.hpp"
@ -110,6 +111,7 @@ public:
// Perform the fill.
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const;
virtual Fill* clone() const = 0;
protected:
Fill() :
layer_id(size_t(-1)),
@ -131,7 +133,9 @@ protected:
unsigned int /* thickness_layers */,
const std::pair<float, Point> & /* direction */,
ExPolygon & /* expolygon */,
Polylines & /* polylines_out */) const {};
Polylines & /* polylines_out */) const {
BOOST_LOG_TRIVIAL(error)<<"Error, the fill isn't implemented";
};
virtual float _layer_angle(size_t idx) const { return (idx & 1) ? float(M_PI/2.) : 0; }

5
src/libslic3r/Fill/FillConcentric.cpp
View File

@ -72,7 +72,10 @@ FillConcentric::_fill_surface_single(
// We want the loops to be split inside the G-code generator to get optimum path planning.
}
void FillConcentricWGapFill::fill_surface_extrusion(const Surface *surface, const FillParams &params,
void
FillConcentricWGapFill::fill_surface_extrusion(
const Surface *surface,
const FillParams &params,
ExtrusionEntitiesPtr &out) const {
// Perform offset.

2
src/libslic3r/Fill/FillConcentric.hpp
View File

@ -18,7 +18,7 @@ protected:
unsigned int thickness_layers,
const std::pair<float, Point> &direction,
ExPolygon &expolygon,
Polylines &polylines_out) const;
Polylines &polylines_out) const override;
virtual bool no_sort() const { return true; }
};

2
src/libslic3r/Fill/FillGyroid.cpp
View File

@ -153,7 +153,7 @@ void FillGyroid::_fill_surface_single(
unsigned int thickness_layers,
const std::pair<float, Point> &direction,
ExPolygon &expolygon,
Polylines &polylines_out)
Polylines &polylines_out) const
{
float infill_angle = this->angle + (CorrectionAngle * 2*M_PI) / 360.;
if(abs(infill_angle) >= EPSILON)

2
src/libslic3r/Fill/FillGyroid.hpp
View File

@ -30,7 +30,7 @@ protected:
unsigned int thickness_layers,
const std::pair<float, Point> &direction,
ExPolygon &expolygon,
Polylines &polylines_out);
Polylines &polylines_out) const override;
};
} // namespace Slic3r

10
src/libslic3r/Fill/FillHoneycomb.cpp
View File

@ -6,18 +6,20 @@
namespace Slic3r {
FillHoneycomb::Cache FillHoneycomb::cache{};
void FillHoneycomb::_fill_surface_single(
const FillParams &params,
unsigned int thickness_layers,
const std::pair<float, Point> &direction,
ExPolygon &expolygon,
Polylines &polylines_out)
Polylines &polylines_out) const
{
// cache hexagons math
CacheID cache_id(params.density, this->spacing);
Cache::iterator it_m = this->cache.find(cache_id);
if (it_m == this->cache.end()) {
it_m = this->cache.insert(it_m, std::pair<CacheID, CacheData>(cache_id, CacheData()));
Cache::iterator it_m = FillHoneycomb::cache.find(cache_id);
if (it_m == FillHoneycomb::cache.end()) {
it_m = FillHoneycomb::cache.insert(it_m, std::pair<CacheID, CacheData>(cache_id, CacheData()));
CacheData &m = it_m->second;
coord_t min_spacing = scale_(this->spacing);
m.distance = min_spacing / params.density;

4
src/libslic3r/Fill/FillHoneycomb.hpp
View File

@ -21,7 +21,7 @@ protected:
unsigned int thickness_layers,
const std::pair<float, Point> &direction,
ExPolygon &expolygon,
Polylines &polylines_out);
Polylines &polylines_out) const override;
// Caching the
struct CacheID
@ -47,7 +47,7 @@ protected:
Point hex_center;
};
typedef std::map<CacheID, CacheData> Cache;
Cache cache;
static Cache cache;
virtual float _layer_angle(size_t idx) const { return float(M_PI/3.) * (idx % 3); }
};

34
src/libslic3r/Fill/FillRectilinear.cpp
View File

@ -7,34 +7,38 @@
namespace Slic3r {
void FillRectilinear::init_spacing(coordf_t spacing, const FillParams &params) {
this->spacing = spacing;
this->_min_spacing = scale_(this->spacing);
assert(params.density > 0.0001f);
this->_line_spacing = coord_t(coordf_t(this->_min_spacing) / params.density);
this->_diagonal_distance = this->_line_spacing * 2;
this->_line_oscillation = this->_line_spacing - this->_min_spacing; // only for Line infill
// define flow spacing according to requested density
if (params.density > 0.9999f && !params.dont_adjust) {
this->_line_spacing = this->_adjust_solid_spacing(bounding_box.size()(0), this->_line_spacing);
this->spacing = unscale<double>(this->_line_spacing);
}
}
void FillRectilinear::_fill_surface_single(
const FillParams &params,
unsigned int thickness_layers,
const std::pair<float, Point> &direction,
ExPolygon &expolygon,
Polylines &polylines_out)
Polylines &polylines_out) const
{
// rotate polygons so that we can work with vertical lines here
expolygon.rotate(- direction.first);
this->_min_spacing = scale_(this->spacing);
assert(params.density > 0.0001f);
this->_line_spacing = coord_t(coordf_t(this->_min_spacing) / params.density);
this->_diagonal_distance = this->_line_spacing * 2;
this->_line_oscillation = this->_line_spacing - this->_min_spacing; // only for Line infill
BoundingBox bounding_box = expolygon.contour.bounding_box();
// define flow spacing according to requested density
if (params.density > 0.9999f && !params.dont_adjust) {
this->_line_spacing = this->_adjust_solid_spacing(bounding_box.size()(0), this->_line_spacing);
this->spacing = unscale<double>(this->_line_spacing);
} else {
if (!(params.density > 0.9999f && !params.dont_adjust)) {
// extend bounding box so that our pattern will be aligned with other layers
// Transform the reference point to the rotated coordinate system.
bounding_box.merge(_align_to_grid(
bounding_box.min,
Point(this->_line_spacing, this->_line_spacing),
direction.second.rotated(- direction.first)));
bounding_box.min,
Point(this->_line_spacing, this->_line_spacing),
direction.second.rotated(-direction.first)));
}
// generate the basic pattern

13
src/libslic3r/Fill/FillRectilinear.hpp
View File

@ -21,7 +21,7 @@ protected:
unsigned int thickness_layers,
const std::pair<float, Point> &direction,
ExPolygon &expolygon,
Polylines &polylines_out);
Polylines &polylines_out) const override;
coord_t _min_spacing;
coord_t _line_spacing;
@ -29,6 +29,7 @@ protected:
coord_t _diagonal_distance;
// only for line infill
coord_t _line_oscillation;
virtual void init_spacing(coordf_t spacing, const FillParams &params) override;
// Enabled for the grid infill, disabled for the rectilinear and line infill.
virtual bool _horizontal_lines() const { return false; }
@ -36,7 +37,7 @@ protected:
virtual Line _line(int i, coord_t x, coord_t y_min, coord_t y_max) const
{ return Line(Point(x, y_min), Point(x, y_max)); }
virtual bool _can_connect(coord_t dist_X, coord_t dist_Y) {
virtual bool _can_connect(coord_t dist_X, coord_t dist_Y) const {
return dist_X <= this->_diagonal_distance
&& dist_Y <= this->_diagonal_distance;
}
@ -48,12 +49,12 @@ public:
virtual ~FillLine() {}
protected:
virtual Line _line(int i, coord_t x, coord_t y_min, coord_t y_max) const {
virtual Line _line(int i, coord_t x, coord_t y_min, coord_t y_max) const override {
coord_t osc = (i & 1) ? this->_line_oscillation : 0;
return Line(Point(x - osc, y_min), Point(x + osc, y_max));
}
virtual bool _can_connect(coord_t dist_X, coord_t dist_Y)
virtual bool _can_connect(coord_t dist_X, coord_t dist_Y) const override
{
double TOLERANCE = 10 * SCALED_EPSILON;
return (dist_X >= (this->_line_spacing - this->_line_oscillation) - TOLERANCE)
@ -69,9 +70,9 @@ public:
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; }
virtual float _layer_angle(size_t idx) const override { return 0.f; }
// Flag for Slic3r::Fill::Rectilinear to fill both directions.
virtual bool _horizontal_lines() const { return true; }
virtual bool _horizontal_lines() const override { return true; }
};
}; // namespace Slic3r

30
src/libslic3r/Fill/FillRectilinear2.hpp
View File

@ -14,9 +14,9 @@ struct ExPolygonWithOffset;
class FillRectilinear2 : public Fill
{
public:
virtual Fill* clone() const { return new FillRectilinear2(*this); };
virtual Fill* clone() const override { return new FillRectilinear2(*this); };
virtual ~FillRectilinear2() {}
void init_spacing(coordf_t spacing, const FillParams &params) override;
virtual void init_spacing(coordf_t spacing, const FillParams &params) override;
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const override;
protected:
@ -28,56 +28,56 @@ protected:
class FillGrid2 : public FillRectilinear2
{
public:
virtual Fill* clone() const { return new FillGrid2(*this); };
virtual Fill* clone() const override { return new FillGrid2(*this); };
virtual ~FillGrid2() {}
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const override;
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; }
virtual float _layer_angle(size_t idx) const override { return 0.f; }
};
class FillTriangles : public FillRectilinear2
{
public:
virtual Fill* clone() const { return new FillTriangles(*this); };
virtual Fill* clone() const override { return new FillTriangles(*this); };
virtual ~FillTriangles() {}
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const override;
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; }
virtual float _layer_angle(size_t idx) const override { return 0.f; }
};
class FillStars : public FillRectilinear2
{
public:
virtual Fill* clone() const { return new FillStars(*this); };
virtual Fill* clone() const override { return new FillStars(*this); };
virtual ~FillStars() {}
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const override;
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; }
virtual float _layer_angle(size_t idx) const override { return 0.f; }
};
class FillCubic : public FillRectilinear2
{
public:
virtual Fill* clone() const { return new FillCubic(*this); };
virtual Fill* clone() const override { return new FillCubic(*this); };
virtual ~FillCubic() {}
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const override;
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; }
virtual float _layer_angle(size_t idx) const override { return 0.f; }
};
class FillRectilinear2Peri : public FillRectilinear2
{
public:
virtual Fill* clone() const { return new FillRectilinear2Peri(*this); };
virtual Fill* clone() const override { return new FillRectilinear2Peri(*this); };
virtual ~FillRectilinear2Peri() {}
//virtual Polylines fill_surface(const Surface *surface, const FillParams &params);
virtual void fill_surface_extrusion(const Surface *surface, const FillParams &params, ExtrusionEntitiesPtr &out) const override;
@ -93,15 +93,15 @@ public:
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const override;
protected:
virtual float _layer_angle(size_t idx) const;
virtual std::vector<SegmentedIntersectionLine> _vert_lines_for_polygon(const ExPolygonWithOffset &poly_with_offset, const BoundingBox &bounding_box, const FillParams &params, coord_t line_spacing) const;
virtual coord_t _line_spacing_for_density(float density) const;
virtual float _layer_angle(size_t idx) const override;
virtual std::vector<SegmentedIntersectionLine> _vert_lines_for_polygon(const ExPolygonWithOffset &poly_with_offset, const BoundingBox &bounding_box, const FillParams &params, coord_t line_spacing) const override;
virtual coord_t _line_spacing_for_density(float density) const override;
};
class FillRectilinearSawtooth : public FillRectilinear2 {
public:
virtual Fill* clone() const { return new FillRectilinearSawtooth(*this); };
virtual Fill* clone() const override { return new FillRectilinearSawtooth(*this); };
virtual ~FillRectilinearSawtooth() {}
virtual void fill_surface_extrusion(const Surface *surface, const FillParams &params, ExtrusionEntitiesPtr &out) const override;

19
src/libslic3r/Fill/FillRectilinear3.cpp
View File

@ -1529,7 +1529,7 @@ static bool fill_hatching_segments_legacy(
}; // namespace FillRectilinear3_Internal
bool FillRectilinear3::fill_surface_by_lines(const Surface *surface, const FillParams &params, std::vector<FillDirParams> &fill_dir_params, Polylines &polylines_out)
bool FillRectilinear3::fill_surface_by_lines(const Surface *surface, const FillParams &params, std::vector<FillDirParams> &fill_dir_params, Polylines &polylines_out) const
{
assert(params.density > 0.0001f);
@ -1566,20 +1566,21 @@ bool FillRectilinear3::fill_surface_by_lines(const Surface *surface, const FillP
return true;
}
Polylines FillRectilinear3::fill_surface(const Surface *surface, const FillParams &params)
Polylines FillRectilinear3::fill_surface(const Surface *surface, const FillParams &params) const
{
Polylines polylines_out;
std::vector<FillDirParams> fill_dir_params;
fill_dir_params.emplace_back(FillDirParams(this->spacing, 0.f));
if (! fill_surface_by_lines(surface, params, fill_dir_params, polylines_out))
printf("FillRectilinear3::fill_surface() failed to fill a region.\n");
if (params.full_infill() && ! params.dont_adjust)
// Return back the adjusted spacing.
this->spacing = fill_dir_params.front().spacing;
//if (params.full_infill() && ! params.dont_adjust)
// Return back the adjusted spacing. //NOT POSSIBLE : DO NOT MODIFY PARAMS AFTER INITIALISATION !!! No one will read it anyway.
//this->spacing = fill_dir_params.front().spacing;
return polylines_out;
}
Polylines FillGrid3::fill_surface(const Surface *surface, const FillParams &params)
Polylines FillGrid3::fill_surface(const Surface *surface, const FillParams &params) const
{
// Each linear fill covers half of the target coverage.
FillParams params2 = params;
@ -1593,7 +1594,7 @@ Polylines FillGrid3::fill_surface(const Surface *surface, const FillParams &para
return polylines_out;
}
Polylines FillTriangles3::fill_surface(const Surface *surface, const FillParams &params)
Polylines FillTriangles3::fill_surface(const Surface *surface, const FillParams &params) const
{
// Each linear fill covers 1/3 of the target coverage.
FillParams params2 = params;
@ -1608,7 +1609,7 @@ Polylines FillTriangles3::fill_surface(const Surface *surface, const FillParams
return polylines_out;
}
Polylines FillStars3::fill_surface(const Surface *surface, const FillParams &params)
Polylines FillStars3::fill_surface(const Surface *surface, const FillParams &params) const
{
// Each linear fill covers 1/3 of the target coverage.
FillParams params2 = params;
@ -1623,7 +1624,7 @@ Polylines FillStars3::fill_surface(const Surface *surface, const FillParams &par
return polylines_out;
}
Polylines FillCubic3::fill_surface(const Surface *surface, const FillParams &params)
Polylines FillCubic3::fill_surface(const Surface *surface, const FillParams &params) const
{
// Each linear fill covers 1/3 of the target coverage.
FillParams params2 = params;

30
src/libslic3r/Fill/FillRectilinear3.hpp
View File

@ -12,9 +12,9 @@ class Surface;
class FillRectilinear3 : public Fill
{
public:
virtual Fill* clone() const { return new FillRectilinear3(*this); };
virtual Fill* clone() const override { return new FillRectilinear3(*this); };
virtual ~FillRectilinear3() {}
virtual Polylines fill_surface(const Surface *surface, const FillParams &params);
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const override;
struct FillDirParams
{
@ -26,55 +26,55 @@ public:
};
protected:
bool fill_surface_by_lines(const Surface *surface, const FillParams &params, std::vector<FillDirParams> &fill_dir_params, Polylines &polylines_out);
bool fill_surface_by_lines(const Surface *surface, const FillParams &params, std::vector<FillDirParams> &fill_dir_params, Polylines &polylines_out) const;
};
class FillGrid3 : public FillRectilinear3
{
public:
virtual Fill* clone() const { return new FillGrid3(*this); };
virtual Fill* clone() const override { return new FillGrid3(*this); };
virtual ~FillGrid3() {}
virtual Polylines fill_surface(const Surface *surface, const FillParams &params);
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const override;
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; }
virtual float _layer_angle(size_t /* idx */) const override { return 0.f; }
};
class FillTriangles3 : public FillRectilinear3
{
public:
virtual Fill* clone() const { return new FillTriangles3(*this); };
virtual Fill* clone() const override { return new FillTriangles3(*this); };
virtual ~FillTriangles3() {}
virtual Polylines fill_surface(const Surface *surface, const FillParams &params);
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const override;
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; }
virtual float _layer_angle(size_t /* idx */) const override { return 0.f; }
};
class FillStars3 : public FillRectilinear3
{
public:
virtual Fill* clone() const { return new FillStars3(*this); };
virtual Fill* clone() const override { return new FillStars3(*this); };
virtual ~FillStars3() {}
virtual Polylines fill_surface(const Surface *surface, const FillParams &params);
virtual Polylines fill_surface(const Surface *surface, const FillParams &params) const override;
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; }
virtual float _layer_angle(size_t /* idx */) const override { return 0.f; }
};
class FillCubic3 : public FillRectilinear3
{
public:
virtual Fill* clone() const { return new FillCubic3(*this); };
virtual Fill* clone() const override { return new FillCubic3(*this); };
virtual ~FillCubic3() {}
virtual Polylines fill_surface(const Surface *surface, const FillParams &params);
virtual Polylines fill_surface(const Surface *surface, const FillParams &params)const override;
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; }
virtual float _layer_angle(size_t /* idx */) const override { return 0.f; }
};