juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-15 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Say when a texture cannot use every mix the setting allows

Browse Source 
Mixed colors reads as a count, but it is a ceiling: a flat-color image is
matched against the filaments alone and gets no mixes, and otherwise the
ranking stops once another mix would no longer noticeably improve the match.
Both were silent, so raising the number past what the texture can use looked
like it did nothing. On a dithered red-to-green gradient with four filaments
the ranking tops out at nine whatever the setting says.

The palette line now names the figure the setting did not reach, and the
tooltip calls the setting a ceiling.
This commit is contained in:
ExPikaPaka
2026-10-15 08:05:15 +02:00
parent 5d73410281
commit d48012e18b
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp
+23 -2
View File
@@ -7358,8 +7358,9 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
// physical filaments.
const int max_mixes = std::max(1, int(EnforcerBlockerType::ExtruderMax) - int(m_palette_filaments.size()));
if (int_row("##color_mix_count", _L("Mixed colors"), &opts.color_mix_count, 1, max_mixes, "%d", card_pad,
_L("The most mixed filaments a bake may add. They are picked from the "
"texture's colors, and only the ones the bake actually uses are created."),
_L("The most mixed filaments a bake may add - a ceiling, not a count. They "
"are picked from the texture's colors, so a texture the filaments already "
"cover gets fewer, and only the ones the bake actually uses are created."),
{ { "mixed_colors_few.png", _L("Few") }, { "mixed_colors_many.png", _L("Many") } }))
m_preview_params_dirty = true;
// After the slider, so a change shows in the same frame.
@@ -7370,6 +7371,26 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
// TRN %1% is the number of printable colors, %2% is "from N filaments".
ImGui::TextDisabled("%s", Slic3r::format(into_u8(_L_PLURAL("%1% printable color %2%", "%1% printable colors %2%", n_colors)),
n_colors, from_filaments).c_str());
// Two reasons the palette can hold fewer mixes than the setting asks for, and both
// used to be silent, leaving the user raising a number that changed nothing. A
// flat-color image is matched against the filaments alone, so it gets none at all;
// otherwise the ranking stops once another mix would no longer noticeably improve
// the match.
const int n_mixes = std::max(0, n_colors - n_filaments);
if (n_mixes < opts.color_mix_count) {
const bool flat = std::any_of(mv->texture_displacement_layers.begin(),
mv->texture_displacement_layers.end(),
[](const TextureDisplacementLayer &l) {
return layer_shows_color(l) &&
analyze_texture_detail(l).flat_colors;
});
ImGui::PushTextWrapPos(content_rx - card_pad);
ImGui::TextDisabled("%s", flat ?
_u8L("Flat-color image: each color prints in one filament, so no mixes are used.").c_str() :
Slic3r::format(_u8L("This texture uses %1% of them - more mixes would not "
"change the result."), n_mixes).c_str());
ImGui::PopTextWrapPos();
}
}
if (int_row("##color_despeckle", _L("Denoise"), &opts.color_despeckle, 0, 6, "%d", card_pad,
_L("Cleans up single stray triangles of the wrong color, which detail finer "