mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-07 07:41:06 +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.
104 lines
3.2 KiB
C++
104 lines
3.2 KiB
C++
#ifndef MODELARRANGE_HPP
|
|
#define MODELARRANGE_HPP
|
|
|
|
#include <functional>
|
|
#include <cstddef>
|
|
#include <libslic3r/Arrange.hpp>
|
|
#include <vector>
|
|
#include "Exception.hpp"
|
|
#include <string>
|
|
#include "Point.hpp"
|
|
#include "libslic3r/PrintConfig.hpp"
|
|
#include "libslic3r/Model.hpp"
|
|
|
|
namespace Slic3r {
|
|
using ModelInstancePtrs = std::vector<ModelInstance*>;
|
|
|
|
using arrangement::ArrangePolygon;
|
|
using arrangement::ArrangePolygons;
|
|
using arrangement::ArrangeParams;
|
|
using arrangement::InfiniteBed;
|
|
using arrangement::CircleBed;
|
|
|
|
// Do something with ArrangePolygons in virtual beds
|
|
using VirtualBedFn = std::function<void(arrangement::ArrangePolygon&)>;
|
|
|
|
[[noreturn]] inline void throw_if_out_of_bed(arrangement::ArrangePolygon& ap)
|
|
{
|
|
throw Slic3r::RuntimeError("Objects could not fit on the bed; bed_idx==" + std::to_string(ap.bed_idx));
|
|
}
|
|
|
|
ArrangePolygons get_arrange_polys(const Model &model, ModelInstancePtrs &instances);
|
|
ArrangePolygon get_arrange_poly(const Model &model);
|
|
bool apply_arrange_polys(ArrangePolygons &polys, ModelInstancePtrs &instances, VirtualBedFn);
|
|
|
|
void duplicate(Model &model, ArrangePolygons &copies, VirtualBedFn);
|
|
void duplicate_objects(Model &model, size_t copies_num);
|
|
|
|
template<class TBed>
|
|
bool arrange_objects(Model & model,
|
|
const TBed & bed,
|
|
const ArrangeParams ¶ms,
|
|
VirtualBedFn vfn = throw_if_out_of_bed)
|
|
{
|
|
ModelInstancePtrs instances;
|
|
auto&& input = get_arrange_polys(model, instances);
|
|
arrangement::arrange(input, bed, params);
|
|
|
|
return apply_arrange_polys(input, instances, vfn);
|
|
}
|
|
|
|
template<class TBed>
|
|
void duplicate(Model & model,
|
|
size_t copies_num,
|
|
const TBed & bed,
|
|
const ArrangeParams ¶ms,
|
|
VirtualBedFn vfn = throw_if_out_of_bed)
|
|
{
|
|
ArrangePolygons copies(copies_num, get_arrange_poly(model));
|
|
arrangement::arrange(copies, bed, params);
|
|
duplicate(model, copies, vfn);
|
|
}
|
|
|
|
template<class TBed>
|
|
void duplicate_objects(Model & model,
|
|
size_t copies_num,
|
|
const TBed & bed,
|
|
const ArrangeParams ¶ms,
|
|
VirtualBedFn vfn = throw_if_out_of_bed)
|
|
{
|
|
duplicate_objects(model, copies_num);
|
|
arrange_objects(model, bed, params, vfn);
|
|
}
|
|
|
|
template<class T> struct PtrWrapper
|
|
{
|
|
T* ptr;
|
|
|
|
explicit PtrWrapper(T* p) : ptr{ p } {}
|
|
|
|
arrangement::ArrangePolygon get_arrange_polygon(const Slic3r::DynamicPrintConfig &config = Slic3r::DynamicPrintConfig()) const
|
|
{
|
|
arrangement::ArrangePolygon ap;
|
|
ptr->get_arrange_polygon(&ap, config);
|
|
return ap;
|
|
}
|
|
|
|
void apply_arrange_result(const Vec2d& t, double rot, int item_id)
|
|
{
|
|
ptr->apply_arrange_result(t, rot);
|
|
ptr->arrange_order = item_id;
|
|
}
|
|
};
|
|
|
|
template<class T>
|
|
arrangement::ArrangePolygon get_arrange_poly(T obj, const DynamicPrintConfig &config = DynamicPrintConfig());
|
|
|
|
template<>
|
|
arrangement::ArrangePolygon get_arrange_poly(ModelInstance* inst, const DynamicPrintConfig& config);
|
|
|
|
ArrangePolygon get_instance_arrange_poly(ModelInstance* instance, const DynamicPrintConfig& config);
|
|
}
|
|
|
|
#endif // MODELARRANGE_HPP
|