mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 22:31:02 +00:00
HanifKoh
8a6377f087
* Add Missing Includes Across src/libslic3r Every libslic3r source and header now directly includes the headers declaring what it uses, rather than relying on the precompiled header or transitive includes. Generated with clang-tidy misc-include-cleaner, with libslic3r headers spelled libslic3r/... so they resolve outside the library's private include paths. MultiMaterialSegmentation.hpp, Support/SupportParameters.hpp and Format/STEP.hpp are made self-contained by hand. * Make the libslic3r Headers Compile on Their Own Each now includes, or forward-declares, what it uses instead of relying on what its includers happened to include first. Left out: I18N.hpp, which errors on purpose when included from GUI code, and VoxelizeCSGMesh.hpp and SLA/bicubic.h, which nothing includes and which no longer compile at all. * Add the Includes Missing From the Hand-Fixed libslic3r Headers clang-tidy would not edit these headers while they failed to compile on their own, so the first pass skipped them. With the headers now self-contained, a second pass adds the rest. * Keep Windows Setup Ahead of the Added libslic3r Includes Print.cpp and Thread.cpp open with a _WIN32 block that has to come first; without the precompiled header, Print.cpp otherwise reaches windows.h through OCCT with NONLS defined and boost/regex fails. OpenVDBUtils.cpp and SLA/SupportTreeBuilder.cpp had includes inside #ifndef NOMINMAX, which libslic3r defines on Windows, so those were skipped there. .clang-tidy also ignores the MSVC STL and UCRT internals, Boost.Multiprecision's fwd.hpp and CPython's Windows include directory. * Re-Add libslic3r Includes After the Clipper2 2.0.1 Migration Rebasing onto main took main's version of the files the Clipper2 migration rewrote, so their added includes are restored here, along with includes for main's new code. Clipper2's individual headers are now ignored by clang-tidy: they only build the Z variant through clipper2_z.hpp, which defines USINGZ first, so including clipper.core.h and the like directly broke ClipperZUtils.cpp.
60 lines
2.6 KiB
C++
60 lines
2.6 KiB
C++
#include "../ClipperUtils.hpp"
|
|
#include "../Print.hpp"
|
|
#include "../ShortestPath.hpp"
|
|
#include "libslic3r/ExPolygon.hpp"
|
|
#include "libslic3r/Fill/Lightning/Layer.hpp"
|
|
#include "FillBase.hpp"
|
|
#include "FillCornerSmoothing.hpp"
|
|
#include "FillLightning.hpp"
|
|
#include "Lightning/Generator.hpp"
|
|
#include <utility>
|
|
#include "libslic3r/Point.hpp"
|
|
#include "libslic3r/Polyline.hpp"
|
|
#include "libslic3r/libslic3r.h"
|
|
#include <algorithm>
|
|
#include <functional>
|
|
|
|
namespace Slic3r::FillLightning {
|
|
|
|
void Filler::_fill_surface_single(
|
|
const FillParams ¶ms,
|
|
unsigned int thickness_layers,
|
|
const std::pair<float, Point> &direction,
|
|
ExPolygon expolygon,
|
|
Polylines &polylines_out)
|
|
{
|
|
const Layer &layer = generator->getTreesForLayer(this->layer_id);
|
|
Polylines fill_lines = layer.convertToLines(to_polygons(expolygon), scaled<coord_t>(0.5 * this->spacing - this->overlap));
|
|
|
|
// Orca: round the turns of the branches. Hairpins are left sharp, as they cannot be rounded, and
|
|
// the reach is capped: cutting a corner moves the branch, and a branch is as long as the object
|
|
// rather than as long as one cell of a pattern, so half of a leg would merge it with its neighbour
|
|
// instead of rounding the turn between them. Half the distance between two branches keeps them
|
|
// apart. With more than one line per infill wall the branches are printed as outlines drawn around
|
|
// them, and the outlines of branches that run into each other merge into a single one; moving a
|
|
// branch by more than a fraction of its printed width breaks such an outline up into separate
|
|
// loops, so that width bounds the reach as well.
|
|
const double branch_width = scaled<double>(this->spacing) * params.multiline;
|
|
const double branch_spacing = branch_width / std::max(double(params.density), EPSILON);
|
|
const double max_reach = 0.5 * (params.multiline > 1 ? branch_width : branch_spacing);
|
|
smooth_polylines_corners(fill_lines, params.smooth_factor, scaled<double>(params.resolution), max_reach);
|
|
|
|
// Apply multiline offset if needed
|
|
multiline_fill(fill_lines, params, spacing);
|
|
|
|
fill_lines = Slic3r::intersection_pl(std::move(fill_lines), expolygon);
|
|
|
|
chain_or_connect_infill(std::move(fill_lines), expolygon, polylines_out, this->spacing, params);
|
|
}
|
|
|
|
void GeneratorDeleter::operator()(Generator *p) {
|
|
delete p;
|
|
}
|
|
|
|
GeneratorPtr build_generator(const PrintObject &print_object, const std::function<void()> &throw_on_cancel_callback)
|
|
{
|
|
return GeneratorPtr(new Generator(print_object, throw_on_cancel_callback));
|
|
}
|
|
|
|
} // namespace Slic3r::FillAdaptive
|