mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-20 13:17:54 -06:00
Squashed commit of the following:
commit 61b3ca0b4b4a0b4cfbbc706ede94ef7ccec4c91f Author: Vojtech Bubnik <bubnikv@gmail.com> Date: Wed Feb 10 15:42:27 2021 +0100 Fix of fuzzy skin commit d971ed51a5bb65e8bdfd326bc41b9d7ab2e20834 Author: Vojtech Bubnik <bubnikv@gmail.com> Date: Wed Feb 10 14:12:51 2021 +0100 CMake adjustment of MINIMUM_BOOST_VERSION commit 5d8aa2c59ecf7e32456f2e43e07dedc7d24eb21c Author: Vojtech Bubnik <bubnikv@gmail.com> Date: Wed Feb 10 14:12:33 2021 +0100 Fix of debug compilation after warning removal. commit 5e339b3078f0c9d75b6fac28ed3c295ae9fbbef5 Author: Vojtech Bubnik <bubnikv@gmail.com> Date: Wed Feb 10 14:11:34 2021 +0100 Fuzzy Skin changes: 1) Moved the parameters to region 2) Removed experimental code. 3) Allowed fuzzyfication of both outer perimeter and holes.
This commit is contained in:
parent
f639c08caf
commit
6555b32f5c
12 changed files with 118 additions and 312 deletions
|
@ -143,16 +143,19 @@ void Layer::make_perimeters()
|
|||
if (! (*it)->slices.empty()) {
|
||||
LayerRegion* other_layerm = *it;
|
||||
const PrintRegionConfig &other_config = other_layerm->region()->config();
|
||||
if (config.perimeter_extruder == other_config.perimeter_extruder
|
||||
&& config.perimeters == other_config.perimeters
|
||||
&& config.perimeter_speed == other_config.perimeter_speed
|
||||
&& config.external_perimeter_speed == other_config.external_perimeter_speed
|
||||
&& config.gap_fill_speed == other_config.gap_fill_speed
|
||||
&& config.overhangs == other_config.overhangs
|
||||
if (config.perimeter_extruder == other_config.perimeter_extruder
|
||||
&& config.perimeters == other_config.perimeters
|
||||
&& config.perimeter_speed == other_config.perimeter_speed
|
||||
&& config.external_perimeter_speed == other_config.external_perimeter_speed
|
||||
&& config.gap_fill_speed == other_config.gap_fill_speed
|
||||
&& config.overhangs == other_config.overhangs
|
||||
&& config.opt_serialize("perimeter_extrusion_width") == other_config.opt_serialize("perimeter_extrusion_width")
|
||||
&& config.thin_walls == other_config.thin_walls
|
||||
&& config.external_perimeters_first == other_config.external_perimeters_first
|
||||
&& config.infill_overlap == other_config.infill_overlap)
|
||||
&& config.thin_walls == other_config.thin_walls
|
||||
&& config.external_perimeters_first == other_config.external_perimeters_first
|
||||
&& config.infill_overlap == other_config.infill_overlap
|
||||
&& config.fuzzy_skin == other_config.fuzzy_skin
|
||||
&& config.fuzzy_skin_thickness == other_config.fuzzy_skin_thickness
|
||||
&& config.fuzzy_skin_point_dist == other_config.fuzzy_skin_point_dist)
|
||||
{
|
||||
other_layerm->perimeters.clear();
|
||||
other_layerm->fills.clear();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue