viewit/OrcaSlicer-KX
5
3
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Add 8x polygon tracing resolution. Disable surface scatter correction by default

Browse Source
This commit is contained in:
sentientstardust
2026-05-30 02:15:04 +01:00
parent 6401c87c3a
commit 8cdb5b0272
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/TextureMapping.hpp
View File

@@ -206,7 +206,7 @@ struct TextureMappingZone
static constexpr int DefaultTopSurfaceContoningPolygonizeResolution = 4;
static constexpr bool DefaultTopSurfaceContoningSurfaceAnchoredStacksEnabled = false;
static constexpr bool DefaultTopSurfaceContoningTdAdjustmentEnabled = true;
static constexpr bool DefaultTopSurfaceContoningSurfaceScatterEnabled = true;
static constexpr bool DefaultTopSurfaceContoningSurfaceScatterEnabled = false;
static constexpr bool DefaultTopSurfaceContoningBeerLambertRgbCorrectionEnabled = false;
static constexpr bool DefaultCompactOffsetMode = true;
static constexpr bool DefaultUseLegacyFixedColorMode = false;
@@ -304,7 +304,7 @@ struct TextureMappingZone
static constexpr int normalize_top_surface_contoning_polygonize_resolution(int value)
{
return value <= 1 ? 1 : (value >= 4 ? 4 : 2);
return value <= 1 ? 1 : (value >= 8 ? 8 : (value >= 4 ? 4 : 2));
}
struct LinearGradientAnchor {

17
src/slic3r/GUI/Plater.cpp
View File

@@ -2936,11 +2936,14 @@ public:
wxArrayString contoning_polygonize_resolution_choices;
contoning_polygonize_resolution_choices.Add(_L("1x"));
contoning_polygonize_resolution_choices.Add(_L("2x"));
contoning_polygonize_resolution_choices.Add(_L("4x (slow)"));
contoning_polygonize_resolution_choices.Add(_L("4x"));
contoning_polygonize_resolution_choices.Add(_L("8x (slow)"));
m_top_surface_contoning_polygonize_resolution_choice =
new wxChoice(m_top_surface_contoning_polygonize_resolution_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, contoning_polygonize_resolution_choices);
const int polygonize_resolution = TextureMappingZone::normalize_top_surface_contoning_polygonize_resolution(top_surface_contoning_polygonize_resolution);
m_top_surface_contoning_polygonize_resolution_choice->SetSelection(polygonize_resolution == 1 ? 0 : (polygonize_resolution == 4 ? 2 : 1));
m_top_surface_contoning_polygonize_resolution_choice->SetSelection(
polygonize_resolution == 1 ? 0 :
(polygonize_resolution == 2 ? 1 : (polygonize_resolution == 4 ? 2 : 3)));
contoning_polygonize_resolution_row->Add(m_top_surface_contoning_polygonize_resolution_choice, 1, wxEXPAND);
contoning_checkboxes_root->Add(m_top_surface_contoning_polygonize_resolution_panel,
0,
@@ -3474,7 +3477,13 @@ public:
if (m_top_surface_contoning_polygonize_resolution_choice == nullptr)
return TextureMappingZone::DefaultTopSurfaceContoningPolygonizeResolution;
const int selection = m_top_surface_contoning_polygonize_resolution_choice->GetSelection();
return selection == 0 ? 1 : (selection == 2 ? 4 : 2);
switch (selection) {
case 0: return 1;
case 1: return 2;
case 2: return 4;
case 3: return 8;
default: return TextureMappingZone::DefaultTopSurfaceContoningPolygonizeResolution;
}
}
bool top_surface_contoning_surface_anchored_stacks_enabled() const
{
@@ -3876,7 +3885,7 @@ private:
upper = std::max(upper, lower);
strong = std::max(strong, upper);
return wxString::Format(_L("Recommendation based on highest TD: %d+ layers"),
lower);
upper);
}
wxString top_surface_contoning_shell_warning_text() const