3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed a regression that non spiral vase mode was broken. #3091

Browse source
This commit is contained in:
SoftFever 2023-12-17 20:27:46 +08:00
parent 9acd550a9c
commit 522b8485aa
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libslic3r/GCode.cpp
View file

@ -2779,9 +2779,11 @@ void GCode::process_layers(
return this->process_layer(print, layer.second, layer_tools, &layer == &layers_to_print.back(), &print_object_instances_ordering, size_t(-1)); return this->process_layer(print, layer.second, layer_tools, &layer == &layers_to_print.back(), &print_object_instances_ordering, size_t(-1));
} }
}); });
float nozzle_diameter = EXTRUDER_CONFIG(nozzle_diameter); if (m_spiral_vase) {
float max_xy_smoothing = m_config.get_abs_value("spiral_mode_max_xy_smoothing", nozzle_diameter); float nozzle_diameter = EXTRUDER_CONFIG(nozzle_diameter);
this->m_spiral_vase.get()->set_max_xy_smoothing(max_xy_smoothing); float max_xy_smoothing = m_config.get_abs_value("spiral_mode_max_xy_smoothing", nozzle_diameter);
this->m_spiral_vase->set_max_xy_smoothing(max_xy_smoothing);
}
const auto spiral_mode = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order, const auto spiral_mode = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
[&spiral_mode = *this->m_spiral_vase.get(), &layers_to_print](LayerResult in) -> LayerResult { [&spiral_mode = *this->m_spiral_vase.get(), &layers_to_print](LayerResult in) -> LayerResult {
if (in.nop_layer_result) if (in.nop_layer_result)
@ -2864,9 +2866,11 @@ void GCode::process_layers(
return this->process_layer(print, { std::move(layer) }, tool_ordering.tools_for_layer(layer.print_z()), &layer == &layers_to_print.back(), nullptr, single_object_idx, prime_extruder); return this->process_layer(print, { std::move(layer) }, tool_ordering.tools_for_layer(layer.print_z()), &layer == &layers_to_print.back(), nullptr, single_object_idx, prime_extruder);
} }
}); });
float nozzle_diameter = EXTRUDER_CONFIG(nozzle_diameter); if (m_spiral_vase) {
float max_xy_smoothing = m_config.get_abs_value("spiral_mode_max_xy_smoothing", nozzle_diameter); float nozzle_diameter = EXTRUDER_CONFIG(nozzle_diameter);
this->m_spiral_vase.get()->set_max_xy_smoothing(max_xy_smoothing); float max_xy_smoothing = m_config.get_abs_value("spiral_mode_max_xy_smoothing", nozzle_diameter);
this->m_spiral_vase->set_max_xy_smoothing(max_xy_smoothing);
}
const auto spiral_mode = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order, const auto spiral_mode = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
[&spiral_mode = *this->m_spiral_vase.get(), &layers_to_print](LayerResult in)->LayerResult { [&spiral_mode = *this->m_spiral_vase.get(), &layers_to_print](LayerResult in)->LayerResult {
spiral_mode.enable(in.spiral_vase_enable); spiral_mode.enable(in.spiral_vase_enable);

2
src/libslic3r/GCode/SpiralVase.hpp
View file

@ -37,7 +37,7 @@ public:
private: private:
const PrintConfig &m_config; const PrintConfig &m_config;
GCodeReader m_reader; GCodeReader m_reader;
float m_max_xy_smoothing; float m_max_xy_smoothing = 0.f;
bool m_enabled = false; bool m_enabled = false;
// First spiral vase layer. Layer height has to be ramped up from zero to the target layer height. // First spiral vase layer. Layer height has to be ramped up from zero to the target layer height.