juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-27 04:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Collapse same-color mixed filament regions across painted areas

Browse Source 
Resolve ordinary mixed-filament painted regions to their effective physical
filament on each layer so adjacent same-color zones can merge into one
continuous area instead of being sliced as separate islands.

Add a global "Collapse same-color mixed regions" option, enabled by default,
and automatically turn it off when Local Z dithering is enabled while still
allowing manual re-enable for experimental use.
This commit is contained in:
Rad
2026-03-26 21:10:15 +01:00
parent a4f0947b49
commit ed0182618e
11 changed files with 158 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/libslic3r/test_mixed_filament.cpp
View File

@@ -221,6 +221,41 @@ TEST_CASE("Mixed filament perimeter resolver uses grouped manual patterns by ins
CHECK(ordered_layer1[1] == 1);
}
TEST_CASE("Mixed filament painted-region resolver collapses ordinary mixed rows to the active physical extruder", "[MixedFilament]")
{
const std::vector<std::string> colors = {"#FF0000", "#00FF00"};
MixedFilamentManager mgr;
mgr.add_custom_filament(1, 2, 50, colors);
REQUIRE(mgr.mixed_filaments().size() == 1);
MixedFilament &row = mgr.mixed_filaments().front();
row.ratio_a = 1;
row.ratio_b = 1;
row.manual_pattern.clear();
row.distribution_mode = int(MixedFilament::Simple);
CHECK(mgr.effective_painted_region_filament_id(3, 2, 0) == 1);
CHECK(mgr.effective_painted_region_filament_id(3, 2, 1) == 2);
}
TEST_CASE("Mixed filament painted-region resolver preserves virtual channels for grouped and same-layer modes", "[MixedFilament]")
{
const std::vector<std::string> colors = {"#00FFFF", "#FF00FF"};
MixedFilamentManager mgr;
mgr.add_custom_filament(1, 2, 50, colors);
REQUIRE(mgr.mixed_filaments().size() == 1);
MixedFilament &row = mgr.mixed_filaments().front();
row.manual_pattern = MixedFilamentManager::normalize_manual_pattern("12,21");
CHECK(mgr.effective_painted_region_filament_id(3, 2, 0) == 3);
row.manual_pattern.clear();
row.distribution_mode = int(MixedFilament::SameLayerPointillisme);
CHECK(mgr.effective_painted_region_filament_id(3, 2, 0) == 3);
}
TEST_CASE("ExtrusionPath copies preserve inset index", "[MixedFilament]")
{
ExtrusionPath src(erPerimeter);