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

Skip prime tower texturing during estimation pass

Browse Source 
- Change default style for supports
This commit is contained in:
sentientstardust
2026-05-19 07:36:14 +01:00
parent a3e979ab8a
commit 532de0f04a
7 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/profiles/Prusa.json
View File

@ -1,6 +1,6 @@
{
"name": "Prusa",
"version": "02.03.02.61",
"version": "02.03.02.62",
"force_update": "0",
"description": "Prusa configurations",
"machine_model_list": [

2
resources/profiles/Prusa/process/process_common_xl.json
View File

@ -27,7 +27,7 @@
"raft_first_layer_expansion": "3",
"raft_contact_distance": "0.2",
"support_type": "tree(auto)",
"support_style": "tree_hybrid",
"support_style": "default",
"support_base_pattern_spacing": "2",
"support_interface_top_layers": "5",
"support_interface_bottom_layers": "0",

2
resources/profiles/Snapmaker.json
View File

@ -1,6 +1,6 @@
{
"name": "Snapmaker",
"version": "02.03.02.61",
"version": "02.03.02.62",
"force_update": "0",
"description": "Snapmaker configurations",
"machine_model_list": [

2
resources/profiles/Snapmaker/process/fdm_process_U1.json
View File

@ -58,7 +58,7 @@
"support_base_pattern_spacing": "2",
"support_speed": "40",
"support_type": "tree(auto)",
"support_style": "tree_hybrid",
"support_style": "default",
"support_threshold_angle": "40",
"support_object_xy_distance": "0.5",
"detect_thin_wall": "0",

2
resources/profiles/Snapmaker/process/fdm_process_U1_common.json
View File

@ -47,7 +47,7 @@
"initial_layer_infill_speed": "60",
"resolution": "0.012",
"support_type": "tree(auto)",
"support_style": "tree_hybrid",
"support_style": "default",
"support_top_z_distance": "0.2",
"support_bottom_z_distance": "0.2",
"support_interface_bottom_layers": "2",

7
src/libslic3r/GCode/WipeTower2.cpp
View File

@ -9,6 +9,7 @@
#include <memory>
#include <sstream>
#include <iomanip>
#include <utility>
#include "ClipperUtils.hpp"
#include "GCodeProcessor.hpp"
@ -2701,10 +2702,12 @@ void WipeTower2::generate(std::vector<std::vector<WipeTower::ToolChangeResult>>
plan_tower();
#if 1
const bool suppress_prime_tower_texture = std::exchange(m_suppress_prime_tower_texture, true);
for (int i=0;i<5;++i) {
save_on_last_wipe();
plan_tower();
}
m_suppress_prime_tower_texture = suppress_prime_tower_texture;
#endif
m_rib_length = std::max({m_rib_length, sqrt(m_wipe_tower_depth * m_wipe_tower_depth + m_wipe_tower_width * m_wipe_tower_width)});
@ -2880,7 +2883,7 @@ Polygon WipeTower2::generate_support_rib_wall(WipeTowerWriter2&
insert_skip_polygon = wall_polygon;
}
bool textured_path_written = false;
if (m_prime_tower_texture.valid() && result_wall.size() == 1 && !result_wall.front().points.empty()) {
if (!m_suppress_prime_tower_texture && m_prime_tower_texture.valid() && result_wall.size() == 1 && !result_wall.front().points.empty()) {
std::vector<size_t> texture_normalization_tools;
const size_t texture_tool_count = m_prime_tower_texture.filament_colours.size();
if (m_layer_info != m_plan.end() && !m_layer_info->texture_mapping_layer_tools.empty()) {
@ -3025,7 +3028,7 @@ Polygon WipeTower2::generate_support_cone_wall(
}
}
}
if (m_prime_tower_texture.valid() && polylines.empty()) {
if (!m_suppress_prime_tower_texture && m_prime_tower_texture.valid() && polylines.empty()) {
std::vector<size_t> texture_normalization_tools;
const size_t texture_tool_count = m_prime_tower_texture.filament_colours.size();
if (m_layer_info != m_plan.end() && !m_layer_info->texture_mapping_layer_tools.empty()) {

1
src/libslic3r/GCode/WipeTower2.hpp
View File

@ -337,6 +337,7 @@ private:
std::vector<float> m_used_filament_length;
std::vector<std::pair<float, std::vector<float>>> m_used_filament_length_until_layer;
PrimeTowerTextureRenderSettings m_prime_tower_texture;
bool m_suppress_prime_tower_texture = false;
// Return index of first toolchange that switches to non-soluble extruder
// ot -1 if there is no such toolchange.