update fill.cpp

This commit is contained in:
Wang YB
2024-03-01 13:18:53 +08:00
parent 8cb30a7329
commit 02857e3fd8

View File

@@ -549,7 +549,7 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
params.anchor_length_max = surface_fill.params.anchor_length_max; params.anchor_length_max = surface_fill.params.anchor_length_max;
params.resolution = resolution; params.resolution = resolution;
//w14 //w14
params.use_arachne = (perimeter_generator == PerimeterGeneratorType::Arachne && surface_fill.params.pattern == ipConcentricInternal) || surface_fill.params.pattern == ipEnsuring; params.use_arachne = (perimeter_generator == PerimeterGeneratorType::Arachne && surface_fill.params.pattern == ipConcentricInternal) || surface_fill.params.pattern == ipEnsuring || surface_fill.params.pattern == ipConcentricInternal;
params.layer_height = layerm.layer()->height; params.layer_height = layerm.layer()->height;
for (ExPolygon &expoly : surface_fill.expolygons) { for (ExPolygon &expoly : surface_fill.expolygons) {
@@ -561,25 +561,25 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
try { try {
if (params.use_arachne) { if (params.use_arachne) {
//w14 //w14
if (surface_fill.params.pattern == ipConcentricInternal) { /* if (surface_fill.params.pattern == ipConcentricInternal) {
layerm.region().config().infill_overlap.percent ? layerm.region().config().infill_overlap.percent ?
f->overlap = layerm.region().config().perimeter_extrusion_width * layerm.region().config().infill_overlap.value / 100 *(-1): f->overlap = layerm.region().config().perimeter_extrusion_width * layerm.region().config().infill_overlap.value / 100 *(-1):
f->overlap = float(layerm.region().config().infill_overlap.value); f->overlap = float(layerm.region().config().infill_overlap.value);
} else } else
f->overlap = 0; f->overlap = 0;*/
thick_polylines = f->fill_surface_arachne(&surface_fill.surface, params); thick_polylines = f->fill_surface_arachne(&surface_fill.surface, params);
} }
//w14 //w14
else { else {
if (surface_fill.params.pattern == ipConcentricInternal) { /* if (surface_fill.params.pattern == ipConcentricInternal) {
layerm.region().config().infill_overlap.percent ? layerm.region().config().infill_overlap.percent ?
f->overlap = layerm.region().config().perimeter_extrusion_width * f->overlap = layerm.region().config().perimeter_extrusion_width *
layerm.region().config().infill_overlap.value / 100 * (-1) : layerm.region().config().infill_overlap.value / 100 * (-1) :
f->overlap = float(layerm.region().config().infill_overlap.value); f->overlap = float(layerm.region().config().infill_overlap.value);
} else } else
f->overlap = 0; f->overlap = 0;*/
polylines = f->fill_surface(&surface_fill.surface, params); polylines = f->fill_surface(&surface_fill.surface, params);
} }
} catch (InfillFailedException &) { } catch (InfillFailedException &) {