mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-08 00:01:09 +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.
57 lines
1.9 KiB
C++
57 lines
1.9 KiB
C++
#ifndef ZIPPERARCHIVEIMPORT_HPP
|
|
#define ZIPPERARCHIVEIMPORT_HPP
|
|
|
|
#include <utility>
|
|
#include <vector>
|
|
#include <string>
|
|
#include <cstdint>
|
|
|
|
#include <boost/property_tree/ptree.hpp>
|
|
|
|
#include "libslic3r/Config.hpp"
|
|
#include "libslic3r/PrintConfig.hpp"
|
|
|
|
namespace Slic3r {
|
|
|
|
// Buffer for arbitraryfiles inside a zipper archive.
|
|
struct EntryBuffer
|
|
{
|
|
std::vector<uint8_t> buf;
|
|
std::string fname;
|
|
};
|
|
|
|
// Structure holding the data read from a zipper archive.
|
|
struct ZipperArchive
|
|
{
|
|
boost::property_tree::ptree profile, config;
|
|
std::vector<EntryBuffer> entries;
|
|
};
|
|
|
|
// Names of the files containing metadata inside the archive.
|
|
const constexpr char *CONFIG_FNAME = "config.ini";
|
|
const constexpr char *PROFILE_FNAME = "prusaslicer.ini";
|
|
|
|
// Read an archive that was written using the Zipper class.
|
|
// The includes parameter is a set of file name substrings that the entries
|
|
// must contain to be included in ZipperArchive.
|
|
// The excludes parameter may contain substrings that filenames must not
|
|
// contain.
|
|
// Every file in the archive is read into ZipperArchive::entries
|
|
// except the files CONFIG_FNAME, and PROFILE_FNAME which are read into
|
|
// ZipperArchive::config and ZipperArchive::profile structures.
|
|
ZipperArchive read_zipper_archive(const std::string &zipfname,
|
|
const std::vector<std::string> &includes,
|
|
const std::vector<std::string> &excludes);
|
|
|
|
// Extract the print profile form the archive into 'out'.
|
|
// Returns a profile that has correct parameters to use for model reconstruction
|
|
// even if the needed parameters were not fully found in the archive's metadata.
|
|
// The inout argument shall be a usable fallback profile if the archive
|
|
// has totally corrupted metadata.
|
|
std::pair<DynamicPrintConfig, ConfigSubstitutions> extract_profile(
|
|
const ZipperArchive &arch, DynamicPrintConfig &inout);
|
|
|
|
} // namespace Slic3r
|
|
|
|
#endif // ZIPPERARCHIVEIMPORT_HPP
|