mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-17 04:41:21 +00:00
Fix wall order on narrow tube walls and under outer brims, and test wall order and direction (#16421)
Co-authored-by: Rodrigo Faselli <162915171+RF47@users.noreply.github.com>
This commit is contained in:
co-authored by
Rodrigo Faselli
parent
c6804fbb68
commit
0acf1e6680
@@ -812,7 +812,8 @@ bool WallToolPaths::removeEmptyToolPaths(std::vector<VariableWidthLines> &toolpa
|
||||
* Get the order constraints of the insets when printing walls per region / hole.
|
||||
* Each returned pair consists of adjacent wall lines where the left has an inset_idx one lower than the right.
|
||||
*
|
||||
* Odd walls should always go after their enclosing wall polygons.
|
||||
* Odd walls follow the same order as even ones, so that the centre line of a narrow wall is an inner wall
|
||||
* like any other when printing inner to outer.
|
||||
*
|
||||
* \param outer_to_inner Whether the wall polygons with a lower inset_idx should go before those with a higher one.
|
||||
*/
|
||||
@@ -886,12 +887,7 @@ WallToolPaths::ExtrusionLineSet WallToolPaths::getRegionOrder(const std::vector<
|
||||
continue; // not directly adjacent
|
||||
if (!shorter_then(loc_here - lineloc_nearby.j.p, (lineloc_here.j.w + lineloc_nearby.j.w) / 2 * diagonal_extension))
|
||||
continue; // points are too far away from each other
|
||||
if (here->is_odd || nearby->is_odd) {
|
||||
if (here->is_odd && !nearby->is_odd && nearby->inset_idx < here->inset_idx)
|
||||
order_requirements.emplace(std::make_pair(nearby, here));
|
||||
if (nearby->is_odd && !here->is_odd && here->inset_idx < nearby->inset_idx)
|
||||
order_requirements.emplace(std::make_pair(here, nearby));
|
||||
} else if ((nearby->inset_idx < here->inset_idx) == outer_to_inner) {
|
||||
if ((nearby->inset_idx < here->inset_idx) == outer_to_inner) {
|
||||
order_requirements.emplace(std::make_pair(nearby, here));
|
||||
} else {
|
||||
assert((nearby->inset_idx > here->inset_idx) == outer_to_inner);
|
||||
|
||||
@@ -62,7 +62,12 @@ public:
|
||||
// Depth in the hierarchy. External perimeter has depth = 0. An external perimeter could be both a contour and a hole.
|
||||
unsigned short depth;
|
||||
// ORCA: an external hole perimeter touching the next outer wall all around, with nothing between them.
|
||||
// E.g. a 1mm tube wall with 0.5mm walls: 2 lines, the contour's outer wall and the hole's.
|
||||
bool is_thin_wall_hole = false;
|
||||
// ORCA: an external hole perimeter with no room for an inner wall beside it, at most gap fill. Every thin wall
|
||||
// hole is one, and so is e.g. a 1.5mm tube wall with 0.5mm walls: 3 lines, the two outer walls and gap fill
|
||||
// between them. A 2mm tube wall has room for an inner wall a side and is not. Only set for Inner/Outer/Inner.
|
||||
bool is_narrow_wall_hole = false;
|
||||
// Children contour, may be both CCW and CW oriented (outer contours or holes).
|
||||
std::vector<PerimeterGeneratorLoop> children;
|
||||
|
||||
@@ -572,7 +577,8 @@ static ExtrusionEntityCollection traverse_extrusions(const PerimeterGenerator& p
|
||||
extrusion_coll.append(std::move(extrusion_loop));
|
||||
// Orca: Reverse the order of paths for thin wall holes. We define thin wall hole as a hole with only one perimeter.
|
||||
const bool thin_wall_hole = !pg_extrusion.is_contour && pg_extrusions.size() == 2;
|
||||
if (thin_wall_hole && perimeter_generator.config->wall_sequence != WallSequence::OuterInner)
|
||||
if (thin_wall_hole && perimeter_generator.config->wall_sequence != WallSequence::OuterInner &&
|
||||
!perimeter_generator.outer_walls_first_for_brim())
|
||||
std::reverse(extrusion_coll.entities.begin(), extrusion_coll.entities.end());
|
||||
}
|
||||
else {
|
||||
@@ -1690,13 +1696,24 @@ void PerimeterGenerator::process_classic()
|
||||
|
||||
last = std::move(offsets);
|
||||
|
||||
// ORCA: a thin wall hole has no room for gap fill or an inner wall anywhere beside its outer wall.
|
||||
// ORCA: a thin wall hole has no room for gap fill or an inner wall anywhere beside its outer wall, a
|
||||
// narrow wall hole none for an inner wall, the room the next loop is offset by below.
|
||||
if (i == 0 && ! holes[0].empty()) {
|
||||
const float room = float(0.5 * (ext_perimeter_spacing2 + gap_fill_min_width));
|
||||
const Polygons reach = to_polygons(offset2_ex(last, -room, room + float(SCALED_EPSILON)));
|
||||
for (PerimeterGeneratorLoop &hole : holes[0])
|
||||
hole.is_thin_wall_hole = intersection_pl(Polylines{ hole.polygon.split_at_first_point() },
|
||||
ClipperUtils::clip_clipper_polygons_with_subject_bbox(reach, get_extents(hole.polygon).inflated(SCALED_EPSILON))).empty();
|
||||
auto reach = [&last](double room) {
|
||||
return to_polygons(offset2_ex(last, -float(room), float(room) + float(SCALED_EPSILON)));
|
||||
};
|
||||
auto out_of_reach = [](const Polygon &hole, const Polygons &reach) {
|
||||
return intersection_pl(Polylines{ hole.split_at_first_point() },
|
||||
ClipperUtils::clip_clipper_polygons_with_subject_bbox(reach, get_extents(hole).inflated(SCALED_EPSILON))).empty();
|
||||
};
|
||||
// Only Inner/Outer/Inner orders narrow wall holes apart.
|
||||
const bool narrow_holes_ordered = this->config->wall_sequence == WallSequence::InnerOuterInner;
|
||||
const Polygons gap_fill_reach = reach(0.5 * (ext_perimeter_spacing2 + gap_fill_min_width));
|
||||
const Polygons inner_wall_reach = narrow_holes_ordered ? reach(ext_perimeter_spacing2 + min_spacing / 2.) : Polygons();
|
||||
for (PerimeterGeneratorLoop &hole : holes[0]) {
|
||||
hole.is_thin_wall_hole = out_of_reach(hole.polygon, gap_fill_reach);
|
||||
hole.is_narrow_wall_hole = narrow_holes_ordered && out_of_reach(hole.polygon, inner_wall_reach);
|
||||
}
|
||||
}
|
||||
|
||||
//BBS: refer to superslicer
|
||||
@@ -1835,18 +1852,16 @@ void PerimeterGenerator::process_classic()
|
||||
|
||||
// if brim will be printed, reverse the order of perimeters so that
|
||||
// we continue inwards after having finished the brim
|
||||
// TODO: add test for perimeter order
|
||||
bool is_outer_wall_first = this->config->wall_sequence == WallSequence::OuterInner;
|
||||
if (is_outer_wall_first ||
|
||||
//BBS: always print outer wall first when there indeed has brim.
|
||||
// btLeadingEdgeOnly is an outer brim too (a belt brim at the part's first contact).
|
||||
(this->layer_id == 0 &&
|
||||
(this->object_config->brim_type == BrimType::btOuterOnly ||
|
||||
this->object_config->brim_type == BrimType::btLeadingEdgeOnly) &&
|
||||
this->object_config->brim_width.value > 0))
|
||||
// Orca: a contour with only a narrow wall hole beside it has nothing to sandwich, and prints the hole first,
|
||||
// then the contour, then the gap fill between them, as Arachne does.
|
||||
const PerimeterGeneratorLoops &island_loops = contours.front();
|
||||
const bool narrow_wall_hole_island = island_loops.size() == 1 && island_loops.front().children.size() == 1 &&
|
||||
island_loops.front().children.front().is_narrow_wall_hole;
|
||||
if (is_outer_wall_first || this->outer_walls_first_for_brim())
|
||||
entities.reverse();
|
||||
// Orca: sandwich mode. Apply after 1st layer.
|
||||
else if ((this->config->wall_sequence == WallSequence::InnerOuterInner) && layer_id > 0){
|
||||
else if ((this->config->wall_sequence == WallSequence::InnerOuterInner) && layer_id > 0 && !narrow_wall_hole_island){
|
||||
entities.reverse(); // reverse all entities - order them from external to internal
|
||||
if(entities.entities.size()>2){ // 3 walls minimum needed to do inner outer inner ordering
|
||||
int position = 0; // index to run the re-ordering for multiple external perimeters in a single island.
|
||||
@@ -2412,11 +2427,25 @@ std::vector<PerimeterGeneratorArachneExtrusion> reorderPerimetersByProximity(std
|
||||
|
||||
// Function to reorder perimeters starting from a given reference index
|
||||
auto reorderFromReference = [&](int referenceIndex) {
|
||||
std::unordered_set<int> firstLevelIndices;
|
||||
firstLevelIndices.insert(referenceIndex);
|
||||
|
||||
// Find first level touching perimeters
|
||||
std::vector<int> firstLevelTouchingIndices = findAllTouchingPerimeters(entities, firstLevelIndices, threshold_external, threshold_internal, 1);
|
||||
// Find first level touching perimeters. The odd centre line of a wall too narrow for two inner walls is shared
|
||||
// by the outer walls on both sides, so those join this island and are printed before it too, holes first.
|
||||
std::vector<int> outerIndices{referenceIndex};
|
||||
std::vector<int> firstLevelTouchingIndices;
|
||||
for (size_t next = 0; next < outerIndices.size(); ++next)
|
||||
for (int idx : findAllTouchingPerimeters(entities, {outerIndices[next]}, threshold_external, threshold_internal, 1)) {
|
||||
if (std::find(firstLevelTouchingIndices.begin(), firstLevelTouchingIndices.end(), idx) != firstLevelTouchingIndices.end())
|
||||
continue;
|
||||
firstLevelTouchingIndices.push_back(idx);
|
||||
if (!entities[idx].extrusion->is_odd)
|
||||
continue;
|
||||
for (size_t i = 0; i < entities.size(); ++i)
|
||||
if (entities[i].extrusion->inset_idx == 0 && includedIndices.count(int(i)) == 0 &&
|
||||
std::find(outerIndices.begin(), outerIndices.end(), int(i)) == outerIndices.end() &&
|
||||
arachne_lines_touch(*entities[i].extrusion, *entities[idx].extrusion, double(threshold_external)))
|
||||
outerIndices.push_back(int(i));
|
||||
}
|
||||
std::stable_partition(outerIndices.begin(), outerIndices.end(),
|
||||
[&entities](int idx) { return entities[idx].extrusion->is_closed && !entities[idx].is_contour; });
|
||||
// Bring the largest first level perimeter to the front
|
||||
// The longest first neighbour is most likely the dominant proximate perimeter
|
||||
// hence printing it immediately after the external perimeter should speed things up
|
||||
@@ -2427,8 +2456,10 @@ std::vector<PerimeterGeneratorArachneExtrusion> reorderPerimetersByProximity(std
|
||||
std::iter_swap(maxIt, firstLevelTouchingIndices.end() - 1);
|
||||
}
|
||||
// Insert first level perimeters into reordered list
|
||||
reordered.push_back(entities[referenceIndex]);
|
||||
includedIndices.insert(referenceIndex);
|
||||
for (int idx : outerIndices) {
|
||||
reordered.push_back(entities[idx]);
|
||||
includedIndices.insert(idx);
|
||||
}
|
||||
|
||||
for (int idx : firstLevelTouchingIndices) {
|
||||
if (includedIndices.count(idx) == 0) {
|
||||
@@ -2757,7 +2788,7 @@ void PerimeterGenerator::process_arachne()
|
||||
|
||||
if (layer_id == 0){ // disable inner outer inner algorithm after the first layer
|
||||
is_outer_wall_first =
|
||||
this->config->wall_sequence == WallSequence::OuterInner;
|
||||
this->config->wall_sequence == WallSequence::OuterInner || this->outer_walls_first_for_brim();
|
||||
}
|
||||
if (is_outer_wall_first) {
|
||||
start_perimeter = 0;
|
||||
@@ -3042,6 +3073,16 @@ ExPolygons PerimeterGenerator::printable_slices(const ExPolygons &slices) const
|
||||
return min_width > EPSILON ? opening_ex(slices, float(scale_(min_width / 2.))) : slices;
|
||||
}
|
||||
|
||||
bool PerimeterGenerator::outer_walls_first_for_brim() const
|
||||
{
|
||||
return layer_id == 0 && brim_puts_outer_walls_first(object_config->brim_type.value, object_config->brim_width.value);
|
||||
}
|
||||
|
||||
bool brim_puts_outer_walls_first(BrimType brim_type, double brim_width)
|
||||
{
|
||||
return brim_width > 0 && (brim_type == btOuterOnly || brim_type == btOuterAndInner || brim_type == btLeadingEdgeOnly);
|
||||
}
|
||||
|
||||
std::vector<Polygons> PerimeterGenerator::generate_lower_polygons_series(float width)
|
||||
{
|
||||
float nozzle_diameter = print_config->nozzle_diameter.get_at(config->outer_wall_filament_id - 1);
|
||||
|
||||
@@ -164,6 +164,8 @@ public:
|
||||
Polygons lower_slices_polygons() const { return m_lower_slices_polygons; }
|
||||
// ORCA: the slices less the slivers the wall generator prints nothing for, so they never count as support.
|
||||
ExPolygons printable_slices(const ExPolygons &slices) const;
|
||||
// ORCA: whether this layer prints its outer walls first for the brim, see brim_puts_outer_walls_first().
|
||||
bool outer_walls_first_for_brim() const;
|
||||
|
||||
private:
|
||||
std::vector<Polygons> generate_lower_polygons_series(float width);
|
||||
@@ -183,6 +185,10 @@ private:
|
||||
Polygons m_lower_slices_polygons;
|
||||
};
|
||||
|
||||
// ORCA: a brim against the outer walls makes the first layer print them first, whatever the wall sequence, so the
|
||||
// brim runs straight on into the outer wall. Auto, ear and painted brims may leave the outer walls bare.
|
||||
bool brim_puts_outer_walls_first(BrimType brim_type, double brim_width);
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "I18N.hpp"
|
||||
#include "Layer.hpp"
|
||||
#include "MutablePolygon.hpp"
|
||||
#include "PerimeterGenerator.hpp"
|
||||
#include "PrintBase.hpp"
|
||||
#include "PrintConfig.hpp"
|
||||
#include "SLA/IndexedMesh.hpp"
|
||||
@@ -1464,15 +1465,13 @@ bool PrintObject::invalidate_state_by_config_options(
|
||||
|| opt_key == "top_surface_speed") {
|
||||
// Brim is printed below supports, support invalidates brim and skirt.
|
||||
steps.emplace_back(posSupportMaterial);
|
||||
if (opt_key == "brim_type") {
|
||||
const auto* old_brim_type = old_config.option<ConfigOptionEnum<BrimType>>(opt_key);
|
||||
const auto* new_brim_type = new_config.option<ConfigOptionEnum<BrimType>>(opt_key);
|
||||
//BBS: When switch to manual brim, the object must have brim, then re-generate perimeter
|
||||
//to make the wall order of first layer to be outer-first
|
||||
// btLeadingEdgeOnly is printed as an outer brim (Brim.cpp, BeltBrim.cpp), so it
|
||||
// takes part in the same first-layer wall order rule.
|
||||
if (old_brim_type->value == btOuterOnly || new_brim_type->value == btOuterOnly ||
|
||||
old_brim_type->value == btLeadingEdgeOnly || new_brim_type->value == btLeadingEdgeOnly)
|
||||
if (opt_key == "brim_type" || opt_key == "brim_width") {
|
||||
// Regenerate the walls when the brim starts or stops putting the first layer's outer walls first.
|
||||
auto outer_walls_first = [](const ConfigOptionResolver &config) {
|
||||
return brim_puts_outer_walls_first(config.option<ConfigOptionEnum<BrimType>>("brim_type")->value,
|
||||
config.option<ConfigOptionFloat>("brim_width")->value);
|
||||
};
|
||||
if (outer_walls_first(old_config) != outer_walls_first(new_config))
|
||||
steps.emplace_back(posPerimeters);
|
||||
}
|
||||
} else if (
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "libslic3r/ClipperUtils.hpp"
|
||||
#include "libslic3r/ExPolygon.hpp"
|
||||
#include "libslic3r/Point.hpp"
|
||||
#include "libslic3r/Polygon.hpp"
|
||||
#include "libslic3r/Polyline.hpp"
|
||||
#include <limits>
|
||||
#include <string>
|
||||
@@ -994,3 +995,384 @@ TEST_CASE("A hole whose outer wall touches the contour's runs with it", "[Perime
|
||||
CHECK(layers[i].holes_ccw.front() == ccw);
|
||||
}
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
// The outer radius of round_tube().
|
||||
const double tube_radius = 11.5;
|
||||
|
||||
// Every setting the tube walls below are measured against. With 0.5mm walls a 1mm tube wall holds only the two
|
||||
// outer walls, touching, and every further 0.5mm makes room for one more inner wall.
|
||||
DynamicPrintConfig tube_config(const char *wall_generator, int wall_loops)
|
||||
{
|
||||
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
||||
config.set_deserialize_strict({
|
||||
{ "wall_generator", wall_generator },
|
||||
{ "wall_loops", wall_loops },
|
||||
{ "wall_sequence", "inner wall/outer wall" },
|
||||
{ "wall_direction", "ccw" },
|
||||
{ "layer_height", 0.2 },
|
||||
{ "initial_layer_print_height", 0.2 },
|
||||
{ "nozzle_diameter", "0.4" },
|
||||
{ "outer_wall_line_width", 0.5 },
|
||||
{ "inner_wall_line_width", 0.5 },
|
||||
{ "precise_outer_wall", true },
|
||||
{ "detect_thin_wall", false },
|
||||
{ "only_one_wall_top", false },
|
||||
{ "only_one_wall_first_layer", false },
|
||||
{ "brim_type", "no_brim" },
|
||||
{ "detect_overhang_wall", true },
|
||||
{ "overhang_reverse", false },
|
||||
{ "overhang_reverse_threshold", "0%" },
|
||||
});
|
||||
return config;
|
||||
}
|
||||
|
||||
// A 2mm tall round tube whose wall is `wall` mm thick.
|
||||
Print &round_tube(Print &print, Model &model, const DynamicPrintConfig &config, double wall)
|
||||
{
|
||||
ModelObject *object = model.add_object();
|
||||
object->name = "round_tube.stl";
|
||||
object->add_volume(make_cylinder(tube_radius, 2.), ModelVolumeType::MODEL_PART, false);
|
||||
object->add_volume(make_cylinder(tube_radius - wall, 2.), ModelVolumeType::NEGATIVE_VOLUME, false);
|
||||
object->add_instance();
|
||||
object->ensure_on_bed();
|
||||
|
||||
print.auto_assign_extruders(object);
|
||||
print.apply(model, config);
|
||||
print.validate();
|
||||
print.set_status_silent();
|
||||
print.process();
|
||||
return print;
|
||||
}
|
||||
|
||||
// The side of the tube wall a wall loop lies on. The centre is the middle of the tube wall, where Arachne lays the
|
||||
// inner wall both sides share when the tube wall is too narrow for a pair of them.
|
||||
enum class TubeSide { Contour, Hole, Centre };
|
||||
|
||||
struct TubeLoop {
|
||||
TubeSide side;
|
||||
int inset;
|
||||
bool ccw;
|
||||
};
|
||||
|
||||
// The wall loops of every layer of round_tube() in extrusion order.
|
||||
std::vector<std::vector<TubeLoop>> tube_loops(const Print &print, double wall)
|
||||
{
|
||||
const double centre = tube_radius - 0.5 * wall;
|
||||
std::vector<std::vector<TubeLoop>> out;
|
||||
for (const Layer *layer : print.objects().front()->layers()) {
|
||||
const Vec2d axis = get_extents(layer->lslices).center().cast<double>();
|
||||
std::vector<TubeLoop> &loops = out.emplace_back();
|
||||
for (const LayerRegion *region : layer->regions())
|
||||
for (const ExtrusionEntity *entity : region->perimeters.flatten().entities) {
|
||||
if (! entity->is_loop())
|
||||
continue;
|
||||
const ExtrusionLoop *loop = static_cast<const ExtrusionLoop*>(entity);
|
||||
const Polygon polygon = loop->polygon();
|
||||
double radius = 0.;
|
||||
for (const Point &p : polygon.points)
|
||||
radius += unscaled<double>((p.cast<double>() - axis).norm());
|
||||
radius /= double(polygon.points.size());
|
||||
const TubeSide side = radius > centre + 0.1 ? TubeSide::Contour : radius < centre - 0.1 ? TubeSide::Hole : TubeSide::Centre;
|
||||
loops.push_back({ side, loop->inset_idx, polygon.is_counter_clockwise() });
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
// The insets one side of a wall is printed in, given its deepest inset: inside out for Inner/Outer, outside in for
|
||||
// Outer/Inner, and for Inner/Outer/Inner the third wall onwards inside out, then the outer wall, then the first inner
|
||||
// wall. Inner/Outer/Inner prints its first layer Inner/Outer, and outside in when there is no third wall.
|
||||
std::vector<int> wall_sequence_insets(const std::string &wall_sequence, bool first_layer, int deepest)
|
||||
{
|
||||
std::vector<int> insets;
|
||||
if (wall_sequence == "inner wall/outer wall" || (wall_sequence == "inner-outer-inner wall" && first_layer)) {
|
||||
for (int inset = deepest; inset >= 0; -- inset)
|
||||
insets.push_back(inset);
|
||||
} else if (wall_sequence == "outer wall/inner wall" || deepest < 2) {
|
||||
for (int inset = 0; inset <= deepest; ++ inset)
|
||||
insets.push_back(inset);
|
||||
} else {
|
||||
for (int inset = deepest; inset >= 2; -- inset)
|
||||
insets.push_back(inset);
|
||||
insets.push_back(0);
|
||||
insets.push_back(1);
|
||||
}
|
||||
return insets;
|
||||
}
|
||||
|
||||
// Whether a wall of round_tube() runs with the contour: all but the walls of the hole, and those too when the hole
|
||||
// is a thin wall hole, its outer wall touching the contour's with nothing between them.
|
||||
bool runs_with_contour(const TubeLoop &loop, bool thin_wall_hole)
|
||||
{
|
||||
return loop.side != TubeSide::Hole || thin_wall_hole;
|
||||
}
|
||||
|
||||
// The insets of the walls on one side of a round_tube() layer, the shared centre line included, in extrusion order.
|
||||
std::vector<int> side_insets(const std::vector<TubeLoop> &loops, TubeSide side)
|
||||
{
|
||||
std::vector<int> insets;
|
||||
for (const TubeLoop &loop : loops)
|
||||
if (loop.side == side || loop.side == TubeSide::Centre)
|
||||
insets.push_back(loop.inset);
|
||||
return insets;
|
||||
}
|
||||
|
||||
// The walls of a round_tube() layer in extrusion order, as side and inset: "c0 c1 h0 h1" is the contour's outer wall,
|
||||
// then its first inner wall, then the same for the hole, and "m" marks the wall in the middle both sides share.
|
||||
std::string wall_order(const std::vector<TubeLoop> &loops)
|
||||
{
|
||||
std::string out;
|
||||
for (const TubeLoop &loop : loops)
|
||||
out += std::string(out.empty() ? "" : " ") + (loop.side == TubeSide::Contour ? "c" : loop.side == TubeSide::Hole ? "h" : "m") +
|
||||
std::to_string(loop.inset);
|
||||
return out;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
// Each side of a tube wall prints its walls in the order the wall sequence asks for, from two walls a side up to
|
||||
// four. The inner wall Arachne lays in the middle of a wall too narrow for a pair of them is an inner wall of both
|
||||
// sides; Classic fills that middle with gap fill instead, so it has one wall less a side there.
|
||||
TEST_CASE("Each side of a tube wall prints its walls in the wall sequence order", "[Perimeters]")
|
||||
{
|
||||
struct TubeWall {
|
||||
double wall;
|
||||
int wall_loops;
|
||||
// Walls a side, a shared inner wall included.
|
||||
int arachne_walls;
|
||||
int classic_walls;
|
||||
};
|
||||
const TubeWall tube = GENERATE(values<TubeWall>({
|
||||
{ 1.5, 3, 2, 1 }, { 2.0, 2, 2, 2 }, { 2.5, 3, 3, 2 }, { 3.0, 3, 3, 3 }, { 4.0, 4, 4, 4 } }));
|
||||
const char *wall_generator = GENERATE("classic", "arachne");
|
||||
const std::string wall_sequence = GENERATE("inner wall/outer wall", "outer wall/inner wall", "inner-outer-inner wall");
|
||||
CAPTURE(tube.wall, tube.wall_loops, wall_generator, wall_sequence);
|
||||
|
||||
DynamicPrintConfig config = tube_config(wall_generator, tube.wall_loops);
|
||||
config.set_deserialize_strict("wall_sequence", wall_sequence);
|
||||
Print print;
|
||||
Model model;
|
||||
round_tube(print, model, config, tube.wall);
|
||||
const std::vector<std::vector<TubeLoop>> layers = tube_loops(print, tube.wall);
|
||||
// 2mm at 0.2mm layers.
|
||||
REQUIRE(layers.size() == 10);
|
||||
|
||||
const int walls = std::string(wall_generator) == "arachne" ? tube.arachne_walls : tube.classic_walls;
|
||||
for (size_t i = 0; i < layers.size(); ++ i) {
|
||||
for (const TubeSide side : { TubeSide::Contour, TubeSide::Hole }) {
|
||||
const bool contour_side = side == TubeSide::Contour;
|
||||
CAPTURE(i, contour_side);
|
||||
const std::vector<int> insets = side_insets(layers[i], side);
|
||||
REQUIRE(int(insets.size()) == walls);
|
||||
CHECK(insets == wall_sequence_insets(wall_sequence, i == 0, walls - 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The outer wall of a thin wall hole touches the contour's with nothing between them. The hole is printed first, so
|
||||
// the contour leans on it, unless the wall sequence puts the outer walls first.
|
||||
TEST_CASE("A thin wall hole is printed before the contour unless the outer walls go first", "[Perimeters]")
|
||||
{
|
||||
const char *wall_generator = GENERATE("classic", "arachne");
|
||||
const std::string wall_sequence = GENERATE("inner wall/outer wall", "outer wall/inner wall", "inner-outer-inner wall");
|
||||
CAPTURE(wall_generator, wall_sequence);
|
||||
|
||||
DynamicPrintConfig config = tube_config(wall_generator, 3);
|
||||
config.set_deserialize_strict("wall_sequence", wall_sequence);
|
||||
Print print;
|
||||
Model model;
|
||||
round_tube(print, model, config, 1.);
|
||||
const std::vector<std::vector<TubeLoop>> layers = tube_loops(print, 1.);
|
||||
REQUIRE(layers.size() == 10);
|
||||
|
||||
const TubeSide first = wall_sequence == "outer wall/inner wall" ? TubeSide::Contour : TubeSide::Hole;
|
||||
for (size_t i = 0; i < layers.size(); ++ i) {
|
||||
CAPTURE(i);
|
||||
REQUIRE(layers[i].size() == 2);
|
||||
REQUIRE(layers[i][0].side != layers[i][1].side);
|
||||
CHECK(layers[i].front().side == first);
|
||||
}
|
||||
}
|
||||
|
||||
// A 1.5mm tube wall leaves Inner/Outer/Inner no third wall to sandwich, only the inner wall Arachne lays in the middle
|
||||
// for both sides, or Classic's gap fill. Past the first layer it prints the hole first, then the contour, then the
|
||||
// middle.
|
||||
TEST_CASE("Inner/Outer/Inner prints the hole of a narrow tube wall first and the middle last", "[Perimeters]")
|
||||
{
|
||||
const char *wall_generator = GENERATE("classic", "arachne");
|
||||
CAPTURE(wall_generator);
|
||||
|
||||
DynamicPrintConfig config = tube_config(wall_generator, 3);
|
||||
config.set_deserialize_strict("wall_sequence", "inner-outer-inner wall");
|
||||
Print print;
|
||||
Model model;
|
||||
round_tube(print, model, config, 1.5);
|
||||
const std::vector<std::vector<TubeLoop>> layers = tube_loops(print, 1.5);
|
||||
REQUIRE(layers.size() == 10);
|
||||
|
||||
// Classic's gap fill is not a wall loop, and goes after the walls.
|
||||
const std::string expected = std::string(wall_generator) == "arachne" ? "h0 c0 m1" : "h0 c0";
|
||||
for (size_t i = 1; i < layers.size(); ++ i) {
|
||||
CAPTURE(i);
|
||||
CHECK(wall_order(layers[i]) == expected);
|
||||
}
|
||||
}
|
||||
|
||||
// The contour's walls run in the wall direction and the hole's against it, except that the walls of a thin wall
|
||||
// hole run with the contour, as does the inner wall Arachne shares between both sides of a 1.5mm tube wall.
|
||||
TEST_CASE("Tube walls run in the wall direction and hole walls against it", "[Perimeters]")
|
||||
{
|
||||
const double wall = GENERATE(1.0, 1.5, 2.0, 3.0);
|
||||
const char *wall_generator = GENERATE("classic", "arachne");
|
||||
const std::string wall_direction = GENERATE("ccw", "cw");
|
||||
CAPTURE(wall, wall_generator, wall_direction);
|
||||
|
||||
DynamicPrintConfig config = tube_config(wall_generator, 3);
|
||||
config.set_deserialize_strict("wall_direction", wall_direction);
|
||||
Print print;
|
||||
Model model;
|
||||
round_tube(print, model, config, wall);
|
||||
const std::vector<std::vector<TubeLoop>> layers = tube_loops(print, wall);
|
||||
REQUIRE(layers.size() == 10);
|
||||
|
||||
const bool thin_wall_hole = wall == 1.;
|
||||
for (size_t i = 0; i < layers.size(); ++ i) {
|
||||
CAPTURE(i);
|
||||
REQUIRE(std::any_of(layers[i].begin(), layers[i].end(), [](const TubeLoop &loop) { return loop.side == TubeSide::Contour; }));
|
||||
REQUIRE(std::any_of(layers[i].begin(), layers[i].end(), [](const TubeLoop &loop) { return loop.side == TubeSide::Hole; }));
|
||||
for (const TubeLoop &loop : layers[i]) {
|
||||
CAPTURE(int(loop.side), loop.inset);
|
||||
CHECK(loop.ccw == (runs_with_contour(loop, thin_wall_hole) == (wall_direction == "ccw")));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Reverse on even with no threshold reverses every wall of every other layer, or only the inner walls when it is
|
||||
// restricted to them, and leaves the order of the walls alone.
|
||||
TEST_CASE("Reverse on even reverses the tube walls of every other layer", "[Perimeters]")
|
||||
{
|
||||
const double wall = GENERATE(1.0, 1.5, 3.0);
|
||||
const char *wall_generator = GENERATE("classic", "arachne");
|
||||
const bool reverse_internal_only = GENERATE(false, true);
|
||||
CAPTURE(wall, wall_generator, reverse_internal_only);
|
||||
|
||||
auto slice = [&](bool overhang_reverse) {
|
||||
DynamicPrintConfig config = tube_config(wall_generator, 3);
|
||||
config.set_deserialize_strict({
|
||||
{ "overhang_reverse", overhang_reverse },
|
||||
{ "overhang_reverse_internal_only", reverse_internal_only },
|
||||
});
|
||||
Print print;
|
||||
Model model;
|
||||
round_tube(print, model, config, wall);
|
||||
return tube_loops(print, wall);
|
||||
};
|
||||
const std::vector<std::vector<TubeLoop>> plain = slice(false);
|
||||
const std::vector<std::vector<TubeLoop>> reversed = slice(true);
|
||||
REQUIRE(plain.size() == 10);
|
||||
REQUIRE(reversed.size() == plain.size());
|
||||
|
||||
for (size_t i = 0; i < plain.size(); ++ i) {
|
||||
CAPTURE(i);
|
||||
REQUIRE(reversed[i].size() == plain[i].size());
|
||||
for (size_t j = 0; j < plain[i].size(); ++ j) {
|
||||
CAPTURE(j);
|
||||
CHECK(reversed[i][j].side == plain[i][j].side);
|
||||
CHECK(reversed[i][j].inset == plain[i][j].inset);
|
||||
const bool flips = i % 2 == 1 && (! reverse_internal_only || plain[i][j].inset > 0);
|
||||
CHECK(reversed[i][j].ccw == (plain[i][j].ccw != flips));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
DynamicPrintConfig brim_tube_config(const char *wall_generator, const std::string &wall_sequence, const char *brim_type, double brim_width)
|
||||
{
|
||||
DynamicPrintConfig config = tube_config(wall_generator, 3);
|
||||
config.set_deserialize_strict({
|
||||
{ "wall_sequence", wall_sequence },
|
||||
{ "brim_type", brim_type },
|
||||
{ "brim_width", brim_width },
|
||||
});
|
||||
return config;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
// A brim against the outer walls makes the first layer print them first, whatever the wall sequence, so the brim runs
|
||||
// straight on into the outer wall: each side of the tube wall outside in, and the contour before a thin wall hole.
|
||||
// Brims that may leave the outer walls bare keep the wall sequence, and so do the layers above.
|
||||
TEST_CASE("A brim against the outer walls makes the first layer print them first", "[Perimeters]")
|
||||
{
|
||||
struct Brim {
|
||||
const char *type;
|
||||
double width;
|
||||
bool outer_walls_first;
|
||||
};
|
||||
const Brim brim = GENERATE(values<Brim>({
|
||||
{ "no_brim", 5., false }, { "inner_only", 5., false }, { "auto_brim", 5., false }, { "outer_only", 0., false },
|
||||
{ "outer_only", 5., true }, { "outer_and_inner", 5., true }, { "leading_edge_only", 5., true } }));
|
||||
const double wall = GENERATE(1.0, 3.0);
|
||||
const char *wall_generator = GENERATE("classic", "arachne");
|
||||
const std::string wall_sequence = GENERATE("inner wall/outer wall", "inner-outer-inner wall");
|
||||
CAPTURE(brim.type, brim.width, wall, wall_generator, wall_sequence);
|
||||
|
||||
Print print;
|
||||
Model model;
|
||||
round_tube(print, model, brim_tube_config(wall_generator, wall_sequence, brim.type, brim.width), wall);
|
||||
const std::vector<std::vector<TubeLoop>> layers = tube_loops(print, wall);
|
||||
REQUIRE(layers.size() == 10);
|
||||
|
||||
// The thin wall hole has its outer wall a side, the 3mm tube wall three walls a side.
|
||||
const size_t walls = wall == 1. ? 1 : 3;
|
||||
for (const size_t i : { size_t(0), size_t(1) }) {
|
||||
const bool outer_walls_first = brim.outer_walls_first && i == 0;
|
||||
for (const TubeSide side : { TubeSide::Contour, TubeSide::Hole }) {
|
||||
const bool contour_side = side == TubeSide::Contour;
|
||||
CAPTURE(i, contour_side);
|
||||
const std::vector<int> insets = side_insets(layers[i], side);
|
||||
REQUIRE(insets.size() == walls);
|
||||
CHECK(insets == wall_sequence_insets(outer_walls_first ? "outer wall/inner wall" : wall_sequence, i == 0, int(walls) - 1));
|
||||
}
|
||||
if (wall == 1.)
|
||||
CHECK(layers[i].front().side == (outer_walls_first ? TubeSide::Contour : TubeSide::Hole));
|
||||
}
|
||||
}
|
||||
|
||||
// Changing the brim of a sliced print regenerates the walls when the first layer's wall order changes with it, so
|
||||
// the print gets the walls a slice from scratch with the new brim gets.
|
||||
TEST_CASE("Changing the brim updates the wall order of the first layer", "[Perimeters]")
|
||||
{
|
||||
struct BrimChange {
|
||||
const char *from_type;
|
||||
double from_width;
|
||||
const char *to_type;
|
||||
double to_width;
|
||||
};
|
||||
const BrimChange change = GENERATE(values<BrimChange>({
|
||||
{ "outer_only", 0., "outer_only", 5. }, { "outer_only", 5., "outer_only", 0. },
|
||||
{ "no_brim", 5., "outer_and_inner", 5. }, { "outer_and_inner", 5., "inner_only", 5. } }));
|
||||
const char *wall_generator = GENERATE("classic", "arachne");
|
||||
CAPTURE(change.from_type, change.from_width, change.to_type, change.to_width, wall_generator);
|
||||
|
||||
const std::string wall_sequence = "inner wall/outer wall";
|
||||
Print print;
|
||||
Model model;
|
||||
round_tube(print, model, brim_tube_config(wall_generator, wall_sequence, change.from_type, change.from_width), 3.);
|
||||
const std::string before = wall_order(tube_loops(print, 3.).front());
|
||||
print.apply(model, brim_tube_config(wall_generator, wall_sequence, change.to_type, change.to_width));
|
||||
print.process();
|
||||
const std::string after = wall_order(tube_loops(print, 3.).front());
|
||||
|
||||
Print fresh_print;
|
||||
Model fresh_model;
|
||||
round_tube(fresh_print, fresh_model, brim_tube_config(wall_generator, wall_sequence, change.to_type, change.to_width), 3.);
|
||||
const std::string fresh = wall_order(tube_loops(fresh_print, 3.).front());
|
||||
|
||||
// The change does turn the first layer around.
|
||||
REQUIRE(before != fresh);
|
||||
CHECK(after == fresh);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user