3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-31 03:40:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH: Change the collision calculation

Browse source 
of the wipe tower's outer wall to use the actual outer wall path.

jira: none
Change-Id: Ib45ecbc328c88c1abe6d9e8567f715331a3ddd37
(cherry picked from commit 0a20f1fe6d6d63cdcb13bc19fd9ae553f45b6f59)
This commit is contained in:
jiangkai.zhao 2025-02-10 15:58:34 +08:00 • committed by Noisyfox
parent f133dd1733
commit d463858fda
5 changed files with 49 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libslic3r/GCode/ConflictChecker.cpp
View file

@ -224,7 +224,8 @@ ConflictResultOpt ConflictChecker::find_inter_of_lines_in_diff_objs(PrintObjectP
LinesBucketQueue conflictQueue;
if (wtdptr.has_value()) { // wipe tower at 0 by default
auto wtpaths = wtdptr.value()->getFakeExtrusionPathsFromWipeTower();
//auto wtpaths = wtdptr.value()->getFakeExtrusionPathsFromWipeTower();
auto wtpaths = wtdptr.value()->getTrueExtrusionPathsFromWipeTower();
ExtrusionLayers wtels;
wtels.type = ExtrusionLayersType::WIPE_TOWER;
for (int i = 0; i < wtpaths.size(); ++i) { // assume that wipe tower always has same height

26
src/libslic3r/GCode/WipeTower.cpp
View file

@ -2959,26 +2959,17 @@ WipeTower::ToolChangeResult WipeTower::finish_layer_new(bool extrude_perimeter,
// for skirt calculation and pass it to GLCanvas for precise preview box
m_wipe_tower_brim_width_real = loops_num * spacing + spacing / 2.f;
//m_wipe_tower_brim_width_real = wt_box.ld.x() - box.ld.x() + spacing / 2.f;
// set wipe_tower_bbx
auto real_polygon = outer_wall;
real_polygon = offset(real_polygon, scaled(spacing/2.f)).front();
auto real_box = get_extents(real_polygon);
m_wipe_tower_bbx = BoundingBoxf(unscale(real_box.min), unscale(real_box.max));
}
//wt_box = box;
}
else {
if (first_layer) {
auto real_polygon = outer_wall;
real_polygon = offset(real_polygon, scaled(spacing / 2.f)).front();
auto real_box = get_extents(real_polygon);
m_wipe_tower_bbx = BoundingBoxf(unscale(real_box.min), unscale(real_box.max));
}
}
if (extrude_perimeter || loops_num > 0)
if (extrude_perimeter || loops_num > 0) {
writer.add_wipe_path(outer_wall, m_filpar[m_current_tool].wipe_dist);
if (!extrude_perimeter)
m_outer_wall.back() = to_polyline(outer_wall);
else
m_outer_wall.push_back(to_polyline(outer_wall));
}
else {
// Now prepare future wipe. box contains rectangle that was extruded last (ccw).
Vec2f target = (writer.pos() == wt_box.ld ? wt_box.rd : (writer.pos() == wt_box.rd ? wt_box.ru : (writer.pos() == wt_box.ru ? wt_box.lu : wt_box.ld)));
@ -3630,7 +3621,7 @@ void WipeTower::generate_new(std::vector<std::vector<WipeTower::ToolChangeResult
int wall_filament = get_wall_filament_for_all_layer();
std::vector<WipeTower::ToolChangeResult> layer_result;
m_outer_wall.reserve(m_plan.size());
int index = 0;
for (auto layer : m_plan) {
reset_block_status();
@ -3790,6 +3781,7 @@ void WipeTower::generate_new(std::vector<std::vector<WipeTower::ToolChangeResult
}
result.emplace_back(std::move(layer_result));
}
assert(m_outer_wall.size() == m_plan.size());
}
@ -3939,13 +3931,13 @@ WipeTower::ToolChangeResult WipeTower::only_generate_out_wall(bool is_new_mode)
//else
// writer.rectangle(wt_box, feedrate);
outer_wall = generate_support_wall_new(writer, wt_box, feedrate, first_layer, m_use_rib_wall, true, m_use_gap_wall);
m_outer_wall.push_back( to_polyline(outer_wall));
// Now prepare future wipe. box contains rectangle that was extruded last (ccw).
// Vec2f target = (writer.pos() == wt_box.ld ? wt_box.rd : (writer.pos() == wt_box.rd ? wt_box.ru : (writer.pos() == wt_box.ru ? wt_box.lu : wt_box.ld)));
//writer.add_wipe_point(writer.pos()).add_wipe_point(target);
writer.add_wipe_path(outer_wall, m_filpar[m_current_tool].wipe_dist);
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Wipe_Tower_End) + "\n");
// Ask our writer about how much material was consumed.

16
src/libslic3r/GCode/WipeTower.hpp
View file

@ -187,7 +187,19 @@ public:
Polygon generate_rib_polygon(const box_coordinates &wt_box);
float get_depth() const { return m_wipe_tower_depth; }
float get_brim_width() const { return m_wipe_tower_brim_width_real; }
BoundingBoxf get_bbx() const { return m_wipe_tower_bbx; }
BoundingBoxf get_bbx() const {
BoundingBox box = get_extents(m_outer_wall.front());
BoundingBoxf res = BoundingBoxf(unscale(box.min), unscale(box.max));
return res;
}
Polylines get_outer_wall() const {
Polylines res = m_outer_wall;
Point trans = scaled(m_rib_offset);
for (auto &polyline : res)
for (auto &p : polyline.points)
p += trans;
return res;
}
float get_height() const { return m_wipe_tower_height; }
float get_layer_height() const { return m_layer_height; }
@ -456,8 +468,8 @@ private:
bool m_left_to_right = true;
float m_extra_spacing = 1.f;
float m_tpu_fixed_spacing = 2;
BoundingBoxf m_wipe_tower_bbx;
std::vector<Vec2f> m_wall_skip_points;
std::vector<Polyline> m_outer_wall;
bool is_first_layer() const { return size_t(m_layer_info - m_plan.begin()) == m_first_layer_idx; }
// Calculates length of extrusion line to extrude given volume

3
src/libslic3r/Print.cpp
View file

@ -2269,7 +2269,6 @@ void Print::process(long long *time_cost_with_cache, bool use_cache)
std::optional<const FakeWipeTower *> wipe_tower_opt = {};
if (this->has_wipe_tower()) {
m_fake_wipe_tower.set_pos({m_config.wipe_tower_x.get_at(m_plate_index), m_config.wipe_tower_y.get_at(m_plate_index)});
m_fake_wipe_tower.set_bbx();
wipe_tower_opt = std::make_optional<const FakeWipeTower *>(&m_fake_wipe_tower);
}
auto conflictRes = ConflictChecker::find_inter_of_lines_in_diff_objs(m_objects, wipe_tower_opt);
@ -3044,7 +3043,7 @@ void Print::_make_wipe_tower()
m_fake_wipe_tower.set_fake_extrusion_data(wipe_tower.position(), wipe_tower.width(), wipe_tower.get_height(),
wipe_tower.get_layer_height(), m_wipe_tower_data.depth, m_wipe_tower_data.brim_width,
{scale_(origin.x()), scale_(origin.y())});
m_fake_wipe_tower.real_bbx = wipe_tower.get_bbx();
m_fake_wipe_tower.outer_wall = wipe_tower.get_outer_wall();
} else {
// Get wiping matrix to get number of extruders and convert vector<double> to vector<float>:
std::vector<float> flush_matrix(cast<float>(m_config.flush_volumes_matrix.values));

40
src/libslic3r/Print.hpp
View file

@ -600,7 +600,7 @@ struct FakeWipeTower
float rotation_angle;
float cone_angle;
Vec2d plate_origin;
BoundingBoxf real_bbx;
Polylines outer_wall; //wipe tower's true outer wall
void set_fake_extrusion_data(Vec2f p, float w, float h, float lh, float d, float bd, Vec2d o)
{
@ -625,11 +625,6 @@ struct FakeWipeTower
cone_angle = ca;
plate_origin = o;
}
void set_bbx()
{
real_bbx.min += pos.cast<double>();
real_bbx.max += pos.cast<double>();
}
void set_pos(Vec2f p) { pos = p; }
void set_pos_and_rotation(const Vec2f& p, float rotation) { pos = p; rotation_angle = rotation; }
@ -639,10 +634,8 @@ struct FakeWipeTower
int d = scale_(depth);
int w = scale_(width);
int bd = scale_(brim_width);
//Point minCorner = {scale_(pos.x()), scale_(pos.y())};
//Point maxCorner = {minCorner.x() + w, minCorner.y() + d};
Point minCorner = {scale_(real_bbx.min.x()), scale_(real_bbx.min.y())};
Point maxCorner = {scale_(real_bbx.max.x()), scale_(real_bbx.max.y())};
Point minCorner = {scale_(pos.x()), scale_(pos.y())};
Point maxCorner = {minCorner.x() + w, minCorner.y() + d};
std::vector<ExtrusionPaths> paths;
for (float h = 0.f; h < height; h += layer_height) {
@ -650,13 +643,26 @@ struct FakeWipeTower
path.polyline = {minCorner, {maxCorner.x(), minCorner.y()}, maxCorner, {minCorner.x(), maxCorner.y()}, minCorner};
paths.push_back({path});
//if (h == 0.f) { // add brim
// ExtrusionPath fakeBrim(ExtrusionRole::erBrim, 0.0, 0.0, layer_height);
// Point wtbminCorner = {minCorner - Point{bd, bd}};
// Point wtbmaxCorner = {maxCorner + Point{bd, bd}};
// fakeBrim.polyline = {wtbminCorner, {wtbmaxCorner.x(), wtbminCorner.y()}, wtbmaxCorner, {wtbminCorner.x(), wtbmaxCorner.y()}, wtbminCorner};
// paths.back().push_back(fakeBrim);
//}
if (h == 0.f) { // add brim
ExtrusionPath fakeBrim(ExtrusionRole::erBrim, 0.0, 0.0, layer_height);
Point wtbminCorner = {minCorner - Point{bd, bd}};
Point wtbmaxCorner = {maxCorner + Point{bd, bd}};
fakeBrim.polyline = {wtbminCorner, {wtbmaxCorner.x(), wtbminCorner.y()}, wtbmaxCorner, {wtbminCorner.x(), wtbmaxCorner.y()}, wtbminCorner};
paths.back().push_back(fakeBrim);
}
}
return paths;
}
std::vector<ExtrusionPaths> getTrueExtrusionPathsFromWipeTower() const
{
std::vector<ExtrusionPaths> paths;
Point trans = {scale_(pos.x()), scale_(pos.y())};
for (auto &polyline : outer_wall) {
ExtrusionPath path(ExtrusionRole::erWipeTower, 0.0, 0.0, layer_height);
path.polyline.points.reserve( polyline.points.size());
for (auto &p : polyline.points) path.polyline.points.push_back(p + trans);
paths.push_back({path});
}
return paths;
}