QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-30 23:48:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

update infill_overlap

Browse Source
This commit is contained in:
Wang YB
2023-12-30 13:53:11 +08:00
parent ce07369753
commit e4497e898c
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,9 +62,6 @@ struct SurfaceFillParams
// Index of this entry in a linear vector. // Index of this entry in a linear vector.
size_t idx = 0; size_t idx = 0;
//w14
double perimeter_extrusion_width = 0;
double infill_overlap = 0;
bool operator<(const SurfaceFillParams &rhs) const { bool operator<(const SurfaceFillParams &rhs) const {
@@ -552,9 +549,6 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
params.resolution = resolution; params.resolution = resolution;
params.use_arachne = (perimeter_generator == PerimeterGeneratorType::Arachne && surface_fill.params.pattern == ipConcentric) || surface_fill.params.pattern == ipEnsuring; params.use_arachne = (perimeter_generator == PerimeterGeneratorType::Arachne && surface_fill.params.pattern == ipConcentric) || surface_fill.params.pattern == ipEnsuring;
params.layer_height = layerm.layer()->height; params.layer_height = layerm.layer()->height;
//w14
const PrintRegionConfig &getregion = layerm.region().config();
params.perimeter_extrusion_width = float(getregion.perimeter_extrusion_width);
for (ExPolygon &expoly : surface_fill.expolygons) { for (ExPolygon &expoly : surface_fill.expolygons) {
// Spacing is modified by the filler to indicate adjustments. Reset it for each expolygon. // Spacing is modified by the filler to indicate adjustments. Reset it for each expolygon.
@@ -566,11 +560,9 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
if (params.use_arachne) { if (params.use_arachne) {
//w14 //w14
if (surface_fill.surface.surface_type == stInternalSolid) { if (surface_fill.surface.surface_type == stInternalSolid) {
getregion.infill_overlap.percent ? layerm.region().config().infill_overlap.percent ?
params.temp_set = params.perimeter_extrusion_width *getregion.infill_overlap.value / 100 : f->overlap = layerm.region().config().perimeter_extrusion_width * layerm.region().config().infill_overlap.value / 100 *(-1):
params.temp_set = float(getregion.infill_overlap.value); f->overlap = float(layerm.region().config().infill_overlap.value);
f->overlap = params.temp_set * (-1);
} }
thick_polylines = f->fill_surface_arachne(&surface_fill.surface, params); thick_polylines = f->fill_surface_arachne(&surface_fill.surface, params);
f->overlap = 0; f->overlap = 0;

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

@@ -63,11 +63,6 @@ struct FillParams
bool use_arachne { false }; bool use_arachne { false };
// Layer height for Concentric infill with Arachne. // Layer height for Concentric infill with Arachne.
coordf_t layer_height { 0.f }; coordf_t layer_height { 0.f };
//w14
double perimeter_extrusion_width{0};
double infill_overlap {0};
double castifop{0};
float temp_set;
}; };
static_assert(IsTriviallyCopyable<FillParams>::value, "FillParams class is not POD (and it should be - see constructor)."); static_assert(IsTriviallyCopyable<FillParams>::value, "FillParams class is not POD (and it should be - see constructor).");