3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Conflict checker: take the wipe tower into account

Browse source
This commit is contained in:
Lukas Matena 2023-05-26 12:38:24 +02:00
parent cc55bcbf5e
commit 985bb54748
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/Print.cpp
View file

@ -1526,6 +1526,10 @@ void Print::_make_wipe_tower()
m_wipe_tower_data.used_filament = wipe_tower.get_used_filament(); m_wipe_tower_data.used_filament = wipe_tower.get_used_filament();
m_wipe_tower_data.number_of_toolchanges = wipe_tower.get_number_of_toolchanges(); m_wipe_tower_data.number_of_toolchanges = wipe_tower.get_number_of_toolchanges();
const Vec3d origin = Vec3d::Zero();
m_fake_wipe_tower.set_fake_extrusion_data(wipe_tower.position(), wipe_tower.width(), wipe_tower.get_wipe_tower_height(), config().first_layer_height, m_wipe_tower_data.depth,
m_wipe_tower_data.brim_width, config().wipe_tower_rotation_angle, {scale_(origin.x()), scale_(origin.y())});
} }
// Generate a recommended G-code output file name based on the format template, default extension, and template parameters // Generate a recommended G-code output file name based on the format template, default extension, and template parameters

29
src/libslic3r/Print.hpp
View file

@ -427,9 +427,10 @@ struct FakeWipeTower
float layer_height; float layer_height;
float depth; float depth;
float brim_width; float brim_width;
float rotation_angle;
Vec2d plate_origin; Vec2d plate_origin;
void set_fake_extrusion_data(const Vec2f& p, float w, float h, float lh, float d, float bd, const Vec2d& o) void set_fake_extrusion_data(const Vec2f& p, float w, float h, float lh, float d, float bd, float ra, const Vec2d& o)
{ {
pos = p; pos = p;
width = w; width = w;
@ -437,6 +438,7 @@ struct FakeWipeTower
layer_height = lh; layer_height = lh;
depth = d; depth = d;
brim_width = bd; brim_width = bd;
rotation_angle = ra;
plate_origin = o; plate_origin = o;
} }
@ -449,15 +451,36 @@ struct FakeWipeTower
int d = scale_(depth); int d = scale_(depth);
int w = scale_(width); int w = scale_(width);
int bd = scale_(brim_width); int bd = scale_(brim_width);
Point minCorner = { scale_(pos.x()), scale_(pos.y()) }; Point minCorner = { -bd, -bd };
Point maxCorner = { minCorner.x() + w, minCorner.y() + d }; Point maxCorner = { minCorner.x() + w + bd, minCorner.y() + d + bd };
std::vector<ExtrusionPaths> paths; std::vector<ExtrusionPaths> paths;
for (float hh = 0.f; hh < h; hh += lh) { for (float hh = 0.f; hh < h; hh += lh) {
ExtrusionPath path(ExtrusionRole::WipeTower, 0.0, 0.0, lh); ExtrusionPath path(ExtrusionRole::WipeTower, 0.0, 0.0, lh);
path.polyline = { minCorner, {maxCorner.x(), minCorner.y()}, maxCorner, {minCorner.x(), maxCorner.y()}, minCorner }; path.polyline = { minCorner, {maxCorner.x(), minCorner.y()}, maxCorner, {minCorner.x(), maxCorner.y()}, minCorner };
paths.push_back({ path }); paths.push_back({ path });
// We added the border, now add several parallel lines so we can detect an object that is fully inside the tower.
// For now, simply use fixed spacing of 3mm.
for (coord_t y=minCorner.y()+scale_(3.); y<maxCorner.y(); y+=scale_(3.)) {
path.polyline = { {minCorner.x(), y}, {maxCorner.x(), y} };
paths.push_back({ path });
}
if (hh == 0.f) {
minCorner = minCorner + Point(bd, bd);
maxCorner = maxCorner - Point(bd, bd);
}
} }
// Rotate and translate the tower into the final position.
for (ExtrusionPaths& ps : paths) {
for (ExtrusionPath& p : ps) {
p.polyline.rotate(Geometry::deg2rad(rotation_angle));
p.polyline.translate(scale_(pos.x()), scale_(pos.y()));
}
}
return paths; return paths;
} }
}; };