3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reduction of dead code in FDM infill.

Browse source
This commit is contained in:
Vojtech Bubnik 2021-02-11 12:24:10 +01:00
parent 9d479fcfb9
commit bdd6685566
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libslic3r/Fill/Fill.cpp
View file

@ -25,7 +25,7 @@ struct SurfaceFillParams
// in unscaled coordinates // in unscaled coordinates
coordf_t spacing = 0.; coordf_t spacing = 0.;
// infill / perimeter overlap, in unscaled coordinates // infill / perimeter overlap, in unscaled coordinates
coordf_t overlap = 0.; // coordf_t overlap = 0.;
// Angle as provided by the region config, in radians. // Angle as provided by the region config, in radians.
float angle = 0.f; float angle = 0.f;
// Non-negative for a bridge. // Non-negative for a bridge.
@ -34,7 +34,7 @@ struct SurfaceFillParams
// FillParams // FillParams
float density = 0.f; float density = 0.f;
// Don't adjust spacing to fill the space evenly. // Don't adjust spacing to fill the space evenly.
bool dont_adjust = false; // bool dont_adjust = false;
// Length of the infill anchor along the perimeter line. // Length of the infill anchor along the perimeter line.
// 1000mm is roughly the maximum length line that fits into a 32bit coord_t. // 1000mm is roughly the maximum length line that fits into a 32bit coord_t.
float anchor_length = 1000.f; float anchor_length = 1000.f;
@ -64,10 +64,10 @@ struct SurfaceFillParams
RETURN_COMPARE_NON_EQUAL(extruder); RETURN_COMPARE_NON_EQUAL(extruder);
RETURN_COMPARE_NON_EQUAL_TYPED(unsigned, pattern); RETURN_COMPARE_NON_EQUAL_TYPED(unsigned, pattern);
RETURN_COMPARE_NON_EQUAL(spacing); RETURN_COMPARE_NON_EQUAL(spacing);
RETURN_COMPARE_NON_EQUAL(overlap); // RETURN_COMPARE_NON_EQUAL(overlap);
RETURN_COMPARE_NON_EQUAL(angle); RETURN_COMPARE_NON_EQUAL(angle);
RETURN_COMPARE_NON_EQUAL(density); RETURN_COMPARE_NON_EQUAL(density);
RETURN_COMPARE_NON_EQUAL_TYPED(unsigned, dont_adjust); // RETURN_COMPARE_NON_EQUAL_TYPED(unsigned, dont_adjust);
RETURN_COMPARE_NON_EQUAL(anchor_length); RETURN_COMPARE_NON_EQUAL(anchor_length);
RETURN_COMPARE_NON_EQUAL(anchor_length_max); RETURN_COMPARE_NON_EQUAL(anchor_length_max);
RETURN_COMPARE_NON_EQUAL(flow.width); RETURN_COMPARE_NON_EQUAL(flow.width);
@ -83,10 +83,10 @@ struct SurfaceFillParams
this->pattern == rhs.pattern && this->pattern == rhs.pattern &&
this->pattern == rhs.pattern && this->pattern == rhs.pattern &&
this->spacing == rhs.spacing && this->spacing == rhs.spacing &&
this->overlap == rhs.overlap && // this->overlap == rhs.overlap &&
this->angle == rhs.angle && this->angle == rhs.angle &&
this->density == rhs.density && this->density == rhs.density &&
this->dont_adjust == rhs.dont_adjust && // this->dont_adjust == rhs.dont_adjust &&
this->anchor_length == rhs.anchor_length && this->anchor_length == rhs.anchor_length &&
this->anchor_length_max == rhs.anchor_length_max && this->anchor_length_max == rhs.anchor_length_max &&
this->flow == rhs.flow && this->flow == rhs.flow &&
@ -385,7 +385,7 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
// apply half spacing using this flow's own spacing and generate infill // apply half spacing using this flow's own spacing and generate infill
FillParams params; FillParams params;
params.density = float(0.01 * surface_fill.params.density); params.density = float(0.01 * surface_fill.params.density);
params.dont_adjust = surface_fill.params.dont_adjust; // false params.dont_adjust = false; // surface_fill.params.dont_adjust;
params.anchor_length = surface_fill.params.anchor_length; params.anchor_length = surface_fill.params.anchor_length;
params.anchor_length_max = surface_fill.params.anchor_length_max; params.anchor_length_max = surface_fill.params.anchor_length_max;