juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-28 12:29:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using resolve mixed

Browse Source
This commit is contained in:
Ian Bassi
2026-08-12 17:50:16 -03:00
committed by SoftFever
parent 8fea099d99
commit 8b20a4b066
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libslic3r/GCode/ToolOrdering.cpp
View File

@@ -91,22 +91,30 @@ bool check_filament_printable_after_group(const std::vector<unsigned int> &used_
} }
// Return a zero based extruder from the region, or extruder_override if overriden. // Return a zero based extruder from the region, or extruder_override if overriden.
// The region accessors below resolve mixed-color slots to the physical filament chosen for
// this layer. Without sub-layer splitting a mixed slot is realized by alternating whole layers
// (deficit round-robin, see resolve_mixed_filaments), so a region asking "which filament?" must
// get the resolved physical one, not the virtual slot id. resolve_mixed() is identity when the
// slot is not mixed, so this is a no-op for every non-mixed setup.
unsigned int LayerTools::wall_extruder_id(const PrintRegion &region) const unsigned int LayerTools::wall_extruder_id(const PrintRegion &region) const
{ {
assert(region.config().outer_wall_filament_id.value > 0); assert(region.config().outer_wall_filament_id.value > 0);
return ((this->extruder_override == 0) ? region.config().outer_wall_filament_id.value : this->extruder_override) - 1; unsigned int result = ((this->extruder_override == 0) ? region.config().outer_wall_filament_id.value : this->extruder_override) - 1;
return resolve_mixed(result);
} }
unsigned int LayerTools::sparse_infill_filament_id(const PrintRegion &region) const unsigned int LayerTools::sparse_infill_filament_id(const PrintRegion &region) const
{ {
assert(region.config().sparse_infill_filament_id.value > 0); assert(region.config().sparse_infill_filament_id.value > 0);
return ((this->extruder_override == 0) ? region.config().sparse_infill_filament_id.value : this->extruder_override) - 1; unsigned int result = ((this->extruder_override == 0) ? region.config().sparse_infill_filament_id.value : this->extruder_override) - 1;
return resolve_mixed(result);
} }
unsigned int LayerTools::internal_solid_filament_id(const PrintRegion &region) const unsigned int LayerTools::internal_solid_filament_id(const PrintRegion &region) const
{ {
assert(region.config().internal_solid_filament_id.value > 0); assert(region.config().internal_solid_filament_id.value > 0);
return ((this->extruder_override == 0) ? region.config().internal_solid_filament_id.value : this->extruder_override) - 1; unsigned int result = ((this->extruder_override == 0) ? region.config().internal_solid_filament_id.value : this->extruder_override) - 1;
return resolve_mixed(result);
} }
// Returns a zero based extruder this eec should be printed with, according to PrintRegion config or extruder_override if overriden. // Returns a zero based extruder this eec should be printed with, according to PrintRegion config or extruder_override if overriden.
@@ -142,7 +150,8 @@ unsigned int LayerTools::extruder(const ExtrusionEntityCollection &extrusions, c
} else } else
extruder = this->extruder_override; extruder = this->extruder_override;
return (extruder == 0) ? 0 : extruder - 1; unsigned int result = (extruder == 0) ? 0 : extruder - 1;
return resolve_mixed(result);
} }
static double calc_max_layer_height(const PrintConfig &config, double max_object_layer_height) static double calc_max_layer_height(const PrintConfig &config, double max_object_layer_height)