amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX: unassigned initial extruder ignored

Browse source 
from BambuStudio
This commit is contained in:
SoftFever 2024-06-15 20:14:48 +08:00
parent 50e8e90dc8
commit 85d88e68be
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/libslic3r/GCode/ToolOrdering.cpp
View file

@ -25,14 +25,20 @@ const static bool g_wipe_into_objects = false;
// Shortest hamilton path problem
static std::vector<unsigned int> solve_extruder_order(const std::vector<std::vector<float>>& wipe_volumes, std::vector<unsigned int> all_extruders, unsigned int start_extruder_id)
static std::vector<unsigned int> solve_extruder_order(const std::vector<std::vector<float>>& wipe_volumes, std::vector<unsigned int> all_extruders, std::optional<unsigned int> start_extruder_id)
{
auto start_iter = std::find(all_extruders.begin(), all_extruders.end(), start_extruder_id);
bool add_start_extruder_flag = false;
if (start_iter == all_extruders.end())
all_extruders.insert(all_extruders.begin(), start_extruder_id), add_start_extruder_flag = true;
else
std::swap(*all_extruders.begin(), *start_iter);
if (start_extruder_id) {
auto start_iter = std::find(all_extruders.begin(), all_extruders.end(), start_extruder_id);
if (start_iter == all_extruders.end())
all_extruders.insert(all_extruders.begin(), *start_extruder_id), add_start_extruder_flag = true;
else
std::swap(*all_extruders.begin(), *start_iter);
}
else {
*start_extruder_id = all_extruders.front();
}
unsigned int iterations = (1 << all_extruders.size());
unsigned int final_state = iterations - 1;
@ -84,7 +90,7 @@ static std::vector<unsigned int> solve_extruder_order(const std::vector<std::vec
return path;
}
std::vector<unsigned int> get_extruders_order(const std::vector<std::vector<float>> &wipe_volumes, std::vector<unsigned int> all_extruders, unsigned int start_extruder_id)
std::vector<unsigned int> get_extruders_order(const std::vector<std::vector<float>> &wipe_volumes, std::vector<unsigned int> all_extruders, std::optional<unsigned int>start_extruder_id)
{
#define USE_DP_OPTIMIZE
#ifdef USE_DP_OPTIMIZE
@ -123,7 +129,6 @@ if (all_extruders.size() > 1) {
#endif // OPTIMIZE
}
// Returns true in case that extruder a comes before b (b does not have to be present). False otherwise.
bool LayerTools::is_extruder_order(unsigned int a, unsigned int b) const
{
@ -837,11 +842,13 @@ void ToolOrdering::reorder_extruders_for_minimum_flush_volume()
for (unsigned int i = 0; i < number_of_extruders; ++i)
wipe_volumes.push_back(std::vector<float>(number_of_extruders, print_config->prime_volume));
}
auto extruders_to_hash_key = [](const std::vector<unsigned int>& extruders, unsigned int initial_extruder_id)->uint32_t {
auto extruders_to_hash_key = [](const std::vector<unsigned int>& extruders,
std::optional<unsigned int> initial_extruder_id) -> uint32_t {
uint32_t hash_key = 0;
// high 16 bit define initial extruder ,low 16 bit define extruder set
hash_key |= (1 << (16 + initial_extruder_id));
if (initial_extruder_id)
hash_key |= (1 << (16 + *initial_extruder_id));
for (auto item : extruders)
hash_key |= (1 << item);
return hash_key;
@ -868,7 +875,7 @@ void ToolOrdering::reorder_extruders_for_minimum_flush_volume()
return false;
};
unsigned int current_extruder_id = -1;
std::optional<unsigned int>current_extruder_id;
for (int i = 0; i < m_layer_tools.size(); ++i) {
LayerTools& lt = m_layer_tools[i];
if (lt.extruders.empty())