mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-13 02:41:16 +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.
109 lines
3.9 KiB
C++
109 lines
3.9 KiB
C++
#ifndef slic3r_FillPlanePath_hpp_
|
|
#define slic3r_FillPlanePath_hpp_
|
|
|
|
#include <cstddef>
|
|
#include <cmath>
|
|
#include <map>
|
|
#include <utility>
|
|
|
|
#include "../libslic3r.h"
|
|
|
|
#include "libslic3r/ExPolygon.hpp"
|
|
#include "FillBase.hpp"
|
|
#include "libslic3r/Point.hpp"
|
|
#include "libslic3r/Polyline.hpp"
|
|
|
|
namespace Slic3r {
|
|
|
|
// The original Perl code used path generators from Math::PlanePath library:
|
|
// http://user42.tuxfamily.org/math-planepath/
|
|
// http://user42.tuxfamily.org/math-planepath/gallery.html
|
|
|
|
class InfillPolylineOutput {
|
|
public:
|
|
InfillPolylineOutput(const double scale_out) : m_scale_out(scale_out) {}
|
|
|
|
void reserve(size_t n) { m_out.reserve(n); }
|
|
void add_point(const Vec2d& pt) { m_out.emplace_back(this->scaled(pt)); }
|
|
Points&& result() { return std::move(m_out); }
|
|
virtual bool clips() const { return false; }
|
|
// The output grid the generated points are snapped to.
|
|
const Point scaled(const Vec2d& fpt) const { return { coord_t(floor(fpt.x() * m_scale_out + 0.5)), coord_t(floor(fpt.y() * m_scale_out + 0.5)) }; }
|
|
|
|
protected:
|
|
// Output polyline.
|
|
Points m_out;
|
|
|
|
private:
|
|
// Scaling coefficient of the generated points before tested against m_bbox and clipped by bbox.
|
|
double m_scale_out;
|
|
};
|
|
|
|
class FillPlanePath : public Fill
|
|
{
|
|
public:
|
|
~FillPlanePath() override = default;
|
|
bool is_self_crossing() override { return false; }
|
|
|
|
protected:
|
|
void _fill_surface_single(
|
|
const FillParams ¶ms,
|
|
unsigned int thickness_layers,
|
|
const std::pair<float, Point> &direction,
|
|
ExPolygon expolygon,
|
|
Polylines &polylines_out) override;
|
|
|
|
float _layer_angle(size_t idx) const override { return 0.f; }
|
|
virtual bool centered() const = 0;
|
|
|
|
friend class InfillPolylineClipper;
|
|
|
|
virtual void generate(coord_t min_x, coord_t min_y, coord_t max_x, coord_t max_y, const double resolution, InfillPolylineOutput &output) = 0;
|
|
virtual void generate(coord_t min_x, coord_t min_y, coord_t max_x, coord_t max_y, const double resolution,
|
|
const FillParams & /* params */, InfillPolylineOutput &output)
|
|
{
|
|
this->generate(min_x, min_y, max_x, max_y, resolution, output);
|
|
}
|
|
};
|
|
|
|
class FillArchimedeanChords : public FillPlanePath
|
|
{
|
|
public:
|
|
Fill* clone() const override { return new FillArchimedeanChords(*this); };
|
|
~FillArchimedeanChords() override = default;
|
|
|
|
protected:
|
|
bool centered() const override { return true; }
|
|
void generate(coord_t min_x, coord_t min_y, coord_t max_x, coord_t max_y, const double resolution, InfillPolylineOutput &output) override;
|
|
};
|
|
|
|
class FillHilbertCurve : public FillPlanePath
|
|
{
|
|
public:
|
|
Fill* clone() const override { return new FillHilbertCurve(*this); };
|
|
~FillHilbertCurve() override = default;
|
|
|
|
protected:
|
|
bool centered() const override { return false; }
|
|
void generate(coord_t min_x, coord_t min_y, coord_t max_x, coord_t max_y, const double resolution, InfillPolylineOutput &output) override;
|
|
void generate(coord_t min_x, coord_t min_y, coord_t max_x, coord_t max_y, const double resolution,
|
|
const FillParams ¶ms, InfillPolylineOutput &output) override;
|
|
};
|
|
|
|
class FillOctagramSpiral : public FillPlanePath
|
|
{
|
|
public:
|
|
Fill* clone() const override { return new FillOctagramSpiral(*this); };
|
|
~FillOctagramSpiral() override = default;
|
|
|
|
protected:
|
|
bool centered() const override { return true; }
|
|
void generate(coord_t min_x, coord_t min_y, coord_t max_x, coord_t max_y, const double resolution, InfillPolylineOutput &output) override;
|
|
void generate(coord_t min_x, coord_t min_y, coord_t max_x, coord_t max_y, const double resolution,
|
|
const FillParams ¶ms, InfillPolylineOutput &output) override;
|
|
};
|
|
|
|
} // namespace Slic3r
|
|
|
|
#endif // slic3r_FillPlanePath_hpp_
|