diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index cc7ee79..660b6e6 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -549,11 +549,7 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: params.anchor_length_max = surface_fill.params.anchor_length_max; params.resolution = resolution; //w14 - //w20 - if (perimeter_generator == PerimeterGeneratorType::Mix_wall) - params.use_arachne = (perimeter_generator == PerimeterGeneratorType::Arachne && surface_fill.params.pattern == ipConcentricInternal) || surface_fill.params.pattern == ipEnsuring || surface_fill.params.pattern == ipConcentricInternal; - else - 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; params.layer_height = layerm.layer()->height; for (ExPolygon &expoly : surface_fill.expolygons) { @@ -565,25 +561,25 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: try { if (params.use_arachne) { //w14 - /* if (surface_fill.params.pattern == ipConcentricInternal) { + if (surface_fill.params.pattern == ipConcentricInternal) { layerm.region().config().infill_overlap.percent ? 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); } else - f->overlap = 0;*/ + f->overlap = 0; thick_polylines = f->fill_surface_arachne(&surface_fill.surface, params); } //w14 else { - /* if (surface_fill.params.pattern == ipConcentricInternal) { + if (surface_fill.params.pattern == ipConcentricInternal) { layerm.region().config().infill_overlap.percent ? 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); } else - f->overlap = 0;*/ + f->overlap = 0; polylines = f->fill_surface(&surface_fill.surface, params); } } catch (InfillFailedException &) { diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 3b5b44b..962ed0b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -230,11 +230,9 @@ static const t_config_enum_values s_keys_map_ForwardCompatibilitySubstitutionRul }; CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(ForwardCompatibilitySubstitutionRule) -//w20 static t_config_enum_values s_keys_map_PerimeterGeneratorType { { "classic", int(PerimeterGeneratorType::Classic) }, - { "arachne", int(PerimeterGeneratorType::Arachne) }, - { "mix_wall", int(PerimeterGeneratorType::Mix_wall) } + { "arachne", int(PerimeterGeneratorType::Arachne) } }; CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(PerimeterGeneratorType) @@ -3533,7 +3531,6 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); - //w20 def = this->add("perimeter_generator", coEnum); def->label = L("Perimeter generator"); def->category = L("Layers and Perimeters"); @@ -3543,8 +3540,7 @@ void PrintConfigDef::init_fff_params() "This setting also affects the Concentric infill."); def->set_enum({ { "classic", L("Classic") }, - { "arachne", L("Arachne") }, - { "mix_wall", L("Mix_wall")} + { "arachne", L("Arachne") } }); def->mode = comAdvanced; def->set_default_value(new ConfigOptionEnum(PerimeterGeneratorType::Arachne)); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 4e30a60..e3af18e 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -133,15 +133,13 @@ enum DraftShield { enum class LabelObjectsStyle { Disabled, Octoprint, Firmware }; -//w20 enum class PerimeterGeneratorType { // Classic perimeter generator using Clipper offsets with constant extrusion width. Classic, // Perimeter generator with variable extrusion width based on the paper // "A framework for adaptive width control of dense contour-parallel toolpaths in fused deposition modeling" ported from Cura. - Arachne, - Mix_wall + Arachne }; //B3 enum class GCodeThumbnailsFormat { QIDI,PNG, JPG, QOI };