GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-15 19:25:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert aa5d17eff480da45b0bac3eb391f9e7f7a7f191b because it broke the alignment between layers.

Browse Source 
The goal of this commit is a lie, it's ~only possible for rectilinear on cubes.
This commit is contained in:
supermerill 2019-10-22 18:00:15 +02:00
parent 43aac7d57c
commit 39b6df8f4a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libslic3r/Fill/FillRectilinear2.cpp
View File

@ -1,3 +1,5 @@
//TODO: don't draw long strait lines inside the overlap region
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
@ -768,7 +770,7 @@ std::vector<SegmentedIntersectionLine> FillRectilinear2::_vert_lines_for_polygon
{ {
// n_vlines = ceil(bbox_width / line_spacing) // n_vlines = ceil(bbox_width / line_spacing)
size_t n_vlines = (bounding_box.max(0) - bounding_box.min(0) + line_spacing - 1) / line_spacing; size_t n_vlines = (bounding_box.max(0) - bounding_box.min(0) + line_spacing - 1) / line_spacing;
coord_t x0 = bounding_box.min(0) + (bounding_box.max(0) - bounding_box.min(0) + line_spacing - n_vlines*line_spacing) / 2; coord_t x0 = bounding_box.min(0);
if (params.full_infill()) if (params.full_infill())
x0 += (line_spacing + SCALED_EPSILON) / 2; x0 += (line_spacing + SCALED_EPSILON) / 2;
@ -893,7 +895,8 @@ bool FillRectilinear2::fill_surface_by_lines(const Surface *surface, const FillP
scale_(0 /*this->overlap*/ - 0.5 * this->spacing)); scale_(0 /*this->overlap*/ - 0.5 * this->spacing));
if (poly_with_offset.n_contours_inner == 0) { if (poly_with_offset.n_contours_inner == 0) {
// Not a single infill line fits. // Not a single infill line fits.
//FIXME maybe one shall trigger the gap fill here? //Prusa: maybe one shall trigger the gap fill here?
//supermerill: not possible here, gapfill return a ThickPolyline, not a Polyline. Have to it after that, to fill un-exterded areas.
return true; return true;
} }

4
src/test/GUI/test_cli.cpp
View File

@ -1,5 +1,7 @@
// !! you have to put the resource folder/shrotcut in your build/run folder
//
//#define CATCH_CONFIG_DISABLE #define CATCH_CONFIG_DISABLE
#include <catch.hpp> #include <catch.hpp>
#include <fstream> #include <fstream>

2
src/test/libslic3r/test_fill.cpp
View File

@ -102,7 +102,7 @@ TEST_CASE("Fill: Pattern Path Length") {
//} //}
//path CAN loop around the hole //path CAN loop around the hole
REQUIRE(paths.size() >= 1); REQUIRE(paths.size() >= 1);
REQUIRE(paths.size() <= 2); REQUIRE(paths.size() <= 3);
// paths don't cross hole // paths don't cross hole
REQUIRE(diff_pl(paths, offset(e, (float)(+SCALED_EPSILON * 10))).size() == 0); REQUIRE(diff_pl(paths, offset(e, (float)(+SCALED_EPSILON * 10))).size() == 0);
} }