GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 20:35:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use scaled point as previous position in ExtrusionOrder

Browse Source
This commit is contained in:
Martin Šach 2024-06-19 18:40:36 +02:00 committed by Lukas Matena
parent d2d9762322
commit e24a781382
3 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libslic3r/GCode.cpp
View File

@ -2299,15 +2299,16 @@ std::vector<GCode::ExtrusionOrder::ExtruderExtrusions> GCodeGenerator::get_sorte
Skirt::make_skirt_loops_per_extruder_1st_layer(print, layer_tools, m_skirt_done) : Skirt::make_skirt_loops_per_extruder_1st_layer(print, layer_tools, m_skirt_done) :
Skirt::make_skirt_loops_per_extruder_other_layers(print, layer_tools, m_skirt_done)}; Skirt::make_skirt_loops_per_extruder_other_layers(print, layer_tools, m_skirt_done)};
using GCode::ExtrusionOrder::InstancePoint;
const auto smooth_path{ const auto smooth_path{
[&](const Layer *layer, const ExtrusionEntityReference &extrusion_reference, [&](const Layer *layer, const ExtrusionEntityReference &extrusion_reference,
const unsigned extruder_id, std::optional<Point> &previous_position) { const unsigned extruder_id, std::optional<InstancePoint> &previous_position) {
const ExtrusionEntity *extrusion_entity{&extrusion_reference.extrusion_entity()}; const ExtrusionEntity *extrusion_entity{&extrusion_reference.extrusion_entity()};
GCode::SmoothPath result; GCode::SmoothPath result;
if (auto loop = dynamic_cast<const ExtrusionLoop *>(extrusion_entity)) { if (auto loop = dynamic_cast<const ExtrusionLoop *>(extrusion_entity)) {
Point seam_point = previous_position ? *previous_position : Point::Zero(); Point seam_point = previous_position ? previous_position->value : Point::Zero();
if (loop->role().is_perimeter() && layer != nullptr) { if (loop->role().is_perimeter() && layer != nullptr) {
seam_point = this->m_seam_placer.place_seam(layer, *loop, seam_point); seam_point = this->m_seam_placer.place_seam(layer, *loop, seam_point);
} }
@ -2344,7 +2345,7 @@ std::vector<GCode::ExtrusionOrder::ExtruderExtrusions> GCodeGenerator::get_sorte
using GCode::SmoothPathElement; using GCode::SmoothPathElement;
for (auto it{result.rbegin()}; it != result.rend(); ++it) { for (auto it{result.rbegin()}; it != result.rend(); ++it) {
if (!it->path.empty()) { if (!it->path.empty()) {
previous_position = it->path.back().point; previous_position = InstancePoint{it->path.back().point};
break; break;
} }
} }

66
src/libslic3r/GCode/ExtrusionOrder.cpp
View File

@ -28,36 +28,36 @@ int get_extruder_id(
return extruder_id; return extruder_id;
} }
Vec2d get_gcode_point(const Point &point, const Vec2d &offset) { Point get_gcode_point(const InstancePoint &point, const Point &offset) {
return Vec2d(unscaled<double>(point.x()), unscaled<double>(point.y())) + offset; return point.value + offset;
} }
Point get_instance_point(const Vec2d &point, const Vec2d &offset) { InstancePoint get_instance_point(const Point &point, const Point &offset) {
return Point::new_scale(point - offset); return {point - offset};
} }
std::optional<Vec2d> get_gcode_point(const std::optional<Point> &point, const Vec2d &offset) { std::optional<Point> get_gcode_point(const std::optional<InstancePoint> &point, const Point &offset) {
if (point) { if (point) {
return get_gcode_point(*point, offset); return get_gcode_point(*point, offset);
} }
return std::nullopt; return std::nullopt;
} }
std::optional<Point> get_instance_point(const std::optional<Vec2d> &point, const Vec2d &offset) { std::optional<InstancePoint> get_instance_point(const std::optional<Point> &point, const Point &offset) {
if (point) { if (point) {
return get_instance_point(*point, offset); return get_instance_point(*point, offset);
} }
return std::nullopt; return std::nullopt;
} }
std::optional<Vec2d> get_last_position(const ExtrusionEntityReferences &extrusions, const Vec2d &offset) { std::optional<Point> get_last_position(const ExtrusionEntityReferences &extrusions, const Point &offset) {
if (!extrusions.empty()) { if (!extrusions.empty()) {
const ExtrusionEntityReference &last_extrusion{extrusions.back()}; const ExtrusionEntityReference &last_extrusion{extrusions.back()};
auto last_loop{dynamic_cast<const ExtrusionLoop *>(&last_extrusion.extrusion_entity())}; auto last_loop{dynamic_cast<const ExtrusionLoop *>(&last_extrusion.extrusion_entity())};
if (last_loop != nullptr) { if (last_loop != nullptr) {
return get_gcode_point(last_loop->seam, offset); return get_gcode_point(InstancePoint{last_loop->seam}, offset);
} }
const Point last_point{ const InstancePoint last_point{
last_extrusion.flipped() ? last_extrusion.extrusion_entity().first_point() : last_extrusion.flipped() ? last_extrusion.extrusion_entity().first_point() :
last_extrusion.extrusion_entity().last_point()}; last_extrusion.extrusion_entity().last_point()};
return get_gcode_point(last_point, offset); return get_gcode_point(last_point, offset);
@ -65,7 +65,7 @@ std::optional<Vec2d> get_last_position(const ExtrusionEntityReferences &extrusio
return std::nullopt; return std::nullopt;
} }
std::optional<Vec2d> get_last_position(const ExtrusionEntitiesPtr &extrusions, const Vec2d &offset){ std::optional<Point> get_last_position(const ExtrusionEntitiesPtr &extrusions, const Point &offset){
if (!extrusions.empty()) { if (!extrusions.empty()) {
return get_last_position({{*extrusions.back(), false}}, offset); return get_last_position({{*extrusions.back(), false}}, offset);
} }
@ -112,8 +112,8 @@ std::vector<Perimeter> extract_perimeter_extrusions(
const LayerIsland &island, const LayerIsland &island,
const ExtractEntityPredicate &predicate, const ExtractEntityPredicate &predicate,
const unsigned extruder_id, const unsigned extruder_id,
const Vec2d &offset, const Point &offset,
std::optional<Vec2d> &previous_position, std::optional<Point> &previous_position,
const PathSmoothingFunction &smooth_path const PathSmoothingFunction &smooth_path
) { ) {
std::vector<Perimeter> result; std::vector<Perimeter> result;
@ -132,7 +132,7 @@ std::vector<Perimeter> extract_perimeter_extrusions(
for (ExtrusionEntity *ee : *eec) { for (ExtrusionEntity *ee : *eec) {
if (ee != nullptr) { if (ee != nullptr) {
std::optional<Point> last_position{get_instance_point(previous_position, offset)}; std::optional<InstancePoint> last_position{get_instance_point(previous_position, offset)};
bool reverse_loop{false}; bool reverse_loop{false};
if (auto loop = dynamic_cast<const ExtrusionLoop *>(ee)) { if (auto loop = dynamic_cast<const ExtrusionLoop *>(ee)) {
const bool is_hole = loop->is_clockwise(); const bool is_hole = loop->is_clockwise();
@ -170,8 +170,8 @@ std::vector<InfillRange> extract_infill_ranges(
const Print &print, const Print &print,
const Layer &layer, const Layer &layer,
const LayerIsland &island, const LayerIsland &island,
const Vec2d &offset, const Point &offset,
std::optional<Vec2d> &previous_position, std::optional<Point> &previous_position,
const ExtractEntityPredicate &predicate, const ExtractEntityPredicate &predicate,
const PathSmoothingFunction &smooth_path, const PathSmoothingFunction &smooth_path,
const unsigned extruder_id const unsigned extruder_id
@ -194,13 +194,13 @@ std::vector<InfillRange> extract_infill_ranges(
predicate predicate
)}; )};
const std::optional<Point> previous_position_scaled{get_instance_point(previous_position, offset)}; const std::optional<InstancePoint> previous_instance_point{get_instance_point(previous_position, offset)};
const Point* start_near{previous_position_scaled ? &(*(previous_position_scaled)) : nullptr}; const Point* start_near{previous_instance_point ? &(previous_instance_point->value) : nullptr};
const ExtrusionEntityReferences sorted_extrusions{sort_fill_extrusions(extrusions, start_near)}; const ExtrusionEntityReferences sorted_extrusions{sort_fill_extrusions(extrusions, start_near)};
std::vector<SmoothPath> paths; std::vector<SmoothPath> paths;
for (const ExtrusionEntityReference &extrusion_reference : sorted_extrusions) { for (const ExtrusionEntityReference &extrusion_reference : sorted_extrusions) {
std::optional<Point> last_position{get_instance_point(previous_position, offset)}; std::optional<InstancePoint> last_position{get_instance_point(previous_position, offset)};
paths.push_back(smooth_path(&layer, extrusion_reference, extruder_id, last_position)); paths.push_back(smooth_path(&layer, extrusion_reference, extruder_id, last_position));
previous_position = get_gcode_point(last_position, offset); previous_position = get_gcode_point(last_position, offset);
} }
@ -216,9 +216,9 @@ std::vector<IslandExtrusions> extract_island_extrusions(
const Layer &layer, const Layer &layer,
const ExtractEntityPredicate &predicate, const ExtractEntityPredicate &predicate,
const PathSmoothingFunction &smooth_path, const PathSmoothingFunction &smooth_path,
const Vec2d &offset, const Point &offset,
const unsigned extruder_id, const unsigned extruder_id,
std::optional<Vec2d> &previous_position std::optional<Point> &previous_position
) { ) {
std::vector<IslandExtrusions> result; std::vector<IslandExtrusions> result;
for (const LayerIsland &island : lslice.islands) { for (const LayerIsland &island : lslice.islands) {
@ -258,9 +258,9 @@ std::vector<InfillRange> extract_ironing_extrusions(
const Layer &layer, const Layer &layer,
const ExtractEntityPredicate &predicate, const ExtractEntityPredicate &predicate,
const PathSmoothingFunction &smooth_path, const PathSmoothingFunction &smooth_path,
const Vec2d &offset, const Point &offset,
const unsigned extruder_id, const unsigned extruder_id,
std::optional<Vec2d> &previous_position std::optional<Point> &previous_position
) { ) {
std::vector<InfillRange> result; std::vector<InfillRange> result;
@ -284,9 +284,9 @@ std::vector<SliceExtrusions> get_slices_extrusions(
const Layer &layer, const Layer &layer,
const ExtractEntityPredicate &predicate, const ExtractEntityPredicate &predicate,
const PathSmoothingFunction &smooth_path, const PathSmoothingFunction &smooth_path,
const Vec2d &offset, const Point &offset,
const unsigned extruder_id, const unsigned extruder_id,
std::optional<Vec2d> &previous_position std::optional<Point> &previous_position
) { ) {
// Note: ironing. // Note: ironing.
// FIXME move ironing into the loop above over LayerIslands? // FIXME move ironing into the loop above over LayerIslands?
@ -367,7 +367,7 @@ std::vector<std::vector<SliceExtrusions>> get_overriden_extrusions(
const std::vector<InstanceToPrint> &instances_to_print, const std::vector<InstanceToPrint> &instances_to_print,
const unsigned int extruder_id, const unsigned int extruder_id,
const PathSmoothingFunction &smooth_path, const PathSmoothingFunction &smooth_path,
std::optional<Vec2d> &previous_position std::optional<Point> &previous_position
) { ) {
std::vector<std::vector<SliceExtrusions>> result; std::vector<std::vector<SliceExtrusions>> result;
@ -388,7 +388,7 @@ std::vector<std::vector<SliceExtrusions>> get_overriden_extrusions(
}; };
const PrintObject &print_object = instance.print_object; const PrintObject &print_object = instance.print_object;
const Vec2d &offset = unscale(print_object.instances()[instance.instance_id].shift); const Point &offset = print_object.instances()[instance.instance_id].shift;
result.emplace_back(get_slices_extrusions( result.emplace_back(get_slices_extrusions(
print, *layer, predicate, smooth_path, offset, extruder_id, previous_position print, *layer, predicate, smooth_path, offset, extruder_id, previous_position
@ -405,14 +405,14 @@ std::vector<NormalExtrusions> get_normal_extrusions(
const std::vector<InstanceToPrint> &instances_to_print, const std::vector<InstanceToPrint> &instances_to_print,
const unsigned int extruder_id, const unsigned int extruder_id,
const PathSmoothingFunction &smooth_path, const PathSmoothingFunction &smooth_path,
std::optional<Vec2d> &previous_position std::optional<Point> &previous_position
) { ) {
std::vector<NormalExtrusions> result; std::vector<NormalExtrusions> result;
for (std::size_t i{0}; i < instances_to_print.size(); ++i) { for (std::size_t i{0}; i < instances_to_print.size(); ++i) {
const InstanceToPrint &instance{instances_to_print[i]}; const InstanceToPrint &instance{instances_to_print[i]};
const PrintObject &print_object = instance.print_object; const PrintObject &print_object = instance.print_object;
const Vec2d &offset = unscale(print_object.instances()[instance.instance_id].shift); const Point &offset = print_object.instances()[instance.instance_id].shift;
result.emplace_back(); result.emplace_back();
@ -466,7 +466,7 @@ std::vector<ExtruderExtrusions> get_extrusions(
unsigned current_extruder_id, unsigned current_extruder_id,
const PathSmoothingFunction &smooth_path, const PathSmoothingFunction &smooth_path,
bool get_brim, bool get_brim,
std::optional<Vec2d> previous_position std::optional<Point> previous_position
) { ) {
unsigned toolchange_number{0}; unsigned toolchange_number{0};
@ -476,7 +476,7 @@ std::vector<ExtruderExtrusions> get_extrusions(
if (layer_tools.has_wipe_tower && wipe_tower != nullptr) { if (layer_tools.has_wipe_tower && wipe_tower != nullptr) {
if (is_toolchange_required(is_first_layer, layer_tools.extruders.back(), extruder_id, current_extruder_id)) { if (is_toolchange_required(is_first_layer, layer_tools.extruders.back(), extruder_id, current_extruder_id)) {
const WipeTower::ToolChangeResult tool_change{wipe_tower->get_toolchange(toolchange_number++)}; const WipeTower::ToolChangeResult tool_change{wipe_tower->get_toolchange(toolchange_number++)};
previous_position = wipe_tower->transform_wt_pt(tool_change.end_pos).cast<double>(); previous_position = Point::new_scale(wipe_tower->transform_wt_pt(tool_change.end_pos));
current_extruder_id = tool_change.new_tool; current_extruder_id = tool_change.new_tool;
} }
} }
@ -487,9 +487,9 @@ std::vector<ExtruderExtrusions> get_extrusions(
const std::pair<size_t, size_t> loops = loops_it->second; const std::pair<size_t, size_t> loops = loops_it->second;
for (std::size_t i = loops.first; i < loops.second; ++i) { for (std::size_t i = loops.first; i < loops.second; ++i) {
const ExtrusionEntityReference entity{*print.skirt().entities[i], false}; const ExtrusionEntityReference entity{*print.skirt().entities[i], false};
std::optional<Point> last_position{get_instance_point(previous_position, {0.0, 0.0})}; std::optional<InstancePoint> last_position{get_instance_point(previous_position, {0, 0})};
SmoothPath path{smooth_path(nullptr, entity, extruder_id, last_position)}; SmoothPath path{smooth_path(nullptr, entity, extruder_id, last_position)};
previous_position = get_gcode_point(last_position, {0.0, 0.0}); previous_position = get_gcode_point(last_position, {0, 0});
extruder_extrusions.skirt.emplace_back(i, std::move(path)); extruder_extrusions.skirt.emplace_back(i, std::move(path));
} }
} }
@ -498,7 +498,7 @@ std::vector<ExtruderExtrusions> get_extrusions(
using GCode::ExtrusionOrder::get_last_position; using GCode::ExtrusionOrder::get_last_position;
if (get_brim) { if (get_brim) {
extruder_extrusions.brim = print.brim().entities; extruder_extrusions.brim = print.brim().entities;
previous_position = get_last_position(extruder_extrusions.brim, {0.0, 0.0}); previous_position = get_last_position(extruder_extrusions.brim, {0, 0});
get_brim = false; get_brim = false;
} }

10
src/libslic3r/GCode/ExtrusionOrder.hpp
View File

@ -79,10 +79,14 @@ struct NormalExtrusions {
std::vector<SliceExtrusions> slices_extrusions; std::vector<SliceExtrusions> slices_extrusions;
}; };
std::optional<Vec2d> get_last_position(const ExtrusionEntitiesPtr &extrusions, const Vec2d &offset); std::optional<Point> get_last_position(const ExtrusionEntitiesPtr &extrusions, const Point &offset);
struct InstancePoint {
Point value;
};
using PathSmoothingFunction = std::function<SmoothPath( using PathSmoothingFunction = std::function<SmoothPath(
const Layer *, const ExtrusionEntityReference &, const unsigned extruder_id, std::optional<Point> &previous_position const Layer *, const ExtrusionEntityReference &, const unsigned extruder_id, std::optional<InstancePoint> &previous_position
)>; )>;
struct ExtruderExtrusions { struct ExtruderExtrusions {
@ -106,7 +110,7 @@ std::vector<ExtruderExtrusions> get_extrusions(
unsigned current_extruder_id, unsigned current_extruder_id,
const PathSmoothingFunction &smooth_path, const PathSmoothingFunction &smooth_path,
bool get_brim, bool get_brim,
std::optional<Vec2d> previous_position std::optional<Point> previous_position
); );
} }