Skip to content

Keep Local-Z whole-object masks scoped to mixed rows #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ratdoux wants to merge 1 commit into
base: bugfix_mix_filament
Choose a base branch
from
Open

Keep Local-Z whole-object masks scoped to mixed rows #394

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions src/libslic3r/PrintObjectSlice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2860,13 +2860,14 @@ static std::vector<std::vector<ExPolygons>> local_z_planner_segmentation_with_wh
continue;

const unsigned int state_id = segmentation_channel_filament_id(channel_idx);
if (!mixed_mgr.is_mixed(state_id, num_physical))
continue;
if (channel_idx >= augmented[layer_id].size())
augmented[layer_id].resize(channel_idx + 1);

append(augmented[layer_id][channel_idx], state_masks);
layer_has_overlay = true;
if (mixed_mgr.is_mixed(state_id, num_physical))
++overlay_mixed_channels;
++overlay_mixed_channels;
}

for (size_t channel_idx = num_physical + 1; channel_idx < augmented[layer_id].size(); ++channel_idx) {
Expand Down Expand Up @@ -3159,9 +3160,9 @@ static void build_local_z_plan(PrintObject &print_object, const std::vector<std:
// Multi-color layer-cycle rows choose a pair once per nominal layer/zone
// and rotate that pair independently from per-subpass A/B cadence.
std::vector<int> row_layer_cycle_index(mixed_rows.size(), 0);
// Painted-only Local-Z keeps cadence isolated per zone. Whole-object Local-Z
// instead syncs newly introduced painted rows to the dominant mixed cadence
// so painted islands do not restart their phase at the boundary.
// Keep Local-Z cadence isolated per mixed row. Different mixed rows may
// share a component filament, but their ratios and phase must not bleed
// into one another.
std::vector<uint8_t> row_active_prev_layer(mixed_rows.size(), uint8_t(0));

std::vector<std::vector<int>> per_row_gradient_layers(mixed_rows.size());
Expand Down Expand Up @@ -3270,18 +3271,8 @@ static void build_local_z_plan(PrintObject &print_object, const std::vector<std:
row_direct_component_error_mm[row_idx].size() == row_direct_component_ids[row_idx].size()) {
std::fill(row_direct_component_error_mm[row_idx].begin(), row_direct_component_error_mm[row_idx].end(), 0.0);
}
const bool can_sync_to_dominant =
local_z_whole_objects &&
dominant_mixed_idx < mixed_rows.size() &&
dominant_mixed_idx != row_idx &&
row_active_this_layer[dominant_mixed_idx] != 0;
if (can_sync_to_dominant) {
row_cadence_index[row_idx] = row_cadence_index[dominant_mixed_idx];
row_layer_cycle_index[row_idx] = row_layer_cycle_index[dominant_mixed_idx];
} else {
row_cadence_index[row_idx] = 0;
row_layer_cycle_index[row_idx] = 0;
}
row_cadence_index[row_idx] = 0;
row_layer_cycle_index[row_idx] = 0;
}
}
std::vector<LocalZActivePair> row_active_pairs(mixed_rows.size());
Expand Down Expand Up @@ -3336,7 +3327,10 @@ static void build_local_z_plan(PrintObject &print_object, const std::vector<std:
continue;
const unsigned int state_id = segmentation_channel_filament_id(channel_idx);
if (state_id >= 1 && state_id <= num_physical) {
if (!dominant_is_gradient)
// Whole-object Local-Z uses physical paint only as a blocker
// when building augmented mixed masks. Do not put ordinary
// filaments into the Local-Z split domain.
if (!local_z_whole_objects && !dominant_is_gradient)
append(fixed_state_masks_by_extruder[state_id - 1], state_masks);
continue;
}
Expand Down Expand Up @@ -3420,17 +3414,20 @@ static void build_local_z_plan(PrintObject &print_object, const std::vector<std:

std::vector<std::vector<double>> isolated_row_pass_heights(mixed_rows.size());
bool isolated_multi_row_mode = false;
if (interval.has_mixed_paint &&
preferred_a <= EPSILON &&
preferred_b <= EPSILON &&
active_mixed_rows > 1) {
if (interval.has_mixed_paint && active_mixed_rows > 1) {
size_t isolated_rows_with_split = 0;
for (size_t row_idx = 0; row_idx < row_active_this_layer.size(); ++row_idx) {
if (row_active_this_layer[row_idx] == 0)
continue;

std::vector<double> row_passes;
if (row_uses_direct_multicolor_solver[row_idx] != 0) {
if (preferred_a > EPSILON || preferred_b > EPSILON) {
row_passes = build_local_z_pass_heights(interval.base_height,
mixed_lower,
mixed_upper,
preferred_a,
preferred_b);
} else if (row_uses_direct_multicolor_solver[row_idx] != 0) {
row_passes = build_local_z_direct_multicolor_pass_heights(mixed_rows[row_idx],
row_direct_component_weights[row_idx],
interval.base_height,
Expand Down