mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 22:31:02 +00:00
HanifKoh
84657ff11e
* Ignore Clipper, libpng, mcut and Boost.Polygon Internals in clang-tidy Each only works through a wrapper or umbrella header: libslic3r/clipper.hpp or clipper_z.hpp configure Clipper before including it, png.h pulls in libpng's config headers, and Boost.Polygon's headers only compile through polygon.hpp or voronoi.hpp. * Ignore minilzo's Config Headers in clang-tidy lzoconf.h and lzodefs.h are internal to minilzo.h, which is what the code includes. * Add Missing Includes Across the Remaining Sources and Tests Covers src/slic3r/Utils, src/slic3r/plugin, src/slic3r/Config, src/libvgcode, src/dev-utils, src/OrcaSlicer.cpp and tests/, the directories left after src/slic3r/GUI and src/libslic3r. Generated with clang-tidy misc-include-cleaner. libvgcode's own headers are included by relative path as in the rest of that library, and Catch2 and pybind11 with angle brackets as elsewhere in the repo. * Make the GUI and Test 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. Headers that only compile on one platform, or that nothing built includes, are left alone. * Keep Windows and nanosvg Setup Ahead of the Added Includes OrcaSlicer.cpp and several tests set _WIN32_WINNT, WIN32_LEAN_AND_MEAN or NOMINMAX before including Windows.h, and the profile validator defines NANOSVG_IMPLEMENTATION before any libslic3r header. The added includes had landed above those blocks, which broke the Windows build. * Add the GUI Includes the First Pass Missed Covers headers that only became editable once they compiled on their own, and wx symbols whose suggested header changed as the clang-tidy ignore list grew after the src/slic3r/GUI pass. * Keep the Added Test Includes Below the NOMINMAX Guard test_marchingsquares.cpp and test_texture_displacement.cpp had includes inside #ifndef NOMINMAX, which the tests inherit as defined on Windows from libslic3r, 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, as in #16068.
81 lines
2.7 KiB
C++
81 lines
2.7 KiB
C++
#include <catch2/catch_all.hpp>
|
|
|
|
#include <catch2/catch_test_macros.hpp>
|
|
#include "libslic3r/Format/DRC.hpp"
|
|
#include "libslic3r/TriangleMesh.hpp"
|
|
|
|
#include <boost/nowide/fstream.hpp>
|
|
|
|
#include <draco/attributes/geometry_attribute.h>
|
|
#include <cstdint>
|
|
#include <draco/attributes/geometry_indices.h>
|
|
#include <draco/compression/config/compression_shared.h>
|
|
#include <draco/compression/encode.h>
|
|
#include <draco/core/draco_types.h>
|
|
#include <draco/core/encoder_buffer.h>
|
|
#include <draco/mesh/mesh.h>
|
|
#include <string>
|
|
#include <ios>
|
|
|
|
#include "test_utils.hpp"
|
|
|
|
using namespace Slic3r;
|
|
|
|
namespace {
|
|
|
|
// Encodes one triangle whose vertices carry a single attribute of the given type.
|
|
// The decoder accepts both a mesh without POSITION and a face index past the point count.
|
|
void write_drc_triangle(const std::string &path, draco::GeometryAttribute::Type attribute_type, uint32_t second_point)
|
|
{
|
|
draco::Mesh mesh;
|
|
mesh.set_num_points(3);
|
|
draco::GeometryAttribute attribute;
|
|
attribute.Init(attribute_type, nullptr, 3, draco::DT_FLOAT32, false, sizeof(float) * 3, 0);
|
|
const int attribute_id = mesh.AddAttribute(attribute, true, 3);
|
|
const float points[3][3] = {{0, 0, 0}, {1, 0, 0}, {0, 1, 0}};
|
|
for (int i = 0; i < 3; ++i)
|
|
mesh.attribute(attribute_id)->SetAttributeValue(draco::AttributeValueIndex(i), points[i]);
|
|
draco::Mesh::Face face;
|
|
face[0] = draco::PointIndex(0);
|
|
face[1] = draco::PointIndex(second_point);
|
|
face[2] = draco::PointIndex(2);
|
|
mesh.AddFace(face);
|
|
|
|
draco::Encoder encoder;
|
|
encoder.SetEncodingMethod(draco::MESH_SEQUENTIAL_ENCODING);
|
|
draco::EncoderBuffer buffer;
|
|
REQUIRE(encoder.EncodeMeshToBuffer(mesh, &buffer).ok());
|
|
boost::nowide::ofstream out(path, std::ios::binary);
|
|
out.write(buffer.data(), static_cast<std::streamsize>(buffer.size()));
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TEST_CASE("A Draco triangle with positions loads", "[DRC]")
|
|
{
|
|
ScopedTemporaryFile drc(".drc");
|
|
write_drc_triangle(drc.string(), draco::GeometryAttribute::POSITION, 1);
|
|
|
|
TriangleMesh mesh;
|
|
REQUIRE(load_drc(drc.string().c_str(), &mesh));
|
|
CHECK(mesh.facets_count() == 1);
|
|
}
|
|
|
|
TEST_CASE("A Draco mesh without a POSITION attribute fails to load", "[DRC][Regression]")
|
|
{
|
|
ScopedTemporaryFile drc(".drc");
|
|
write_drc_triangle(drc.string(), draco::GeometryAttribute::GENERIC, 1);
|
|
|
|
TriangleMesh mesh;
|
|
CHECK_FALSE(load_drc(drc.string().c_str(), &mesh));
|
|
}
|
|
|
|
TEST_CASE("A Draco face referencing a missing point fails to load", "[DRC][Regression]")
|
|
{
|
|
ScopedTemporaryFile drc(".drc");
|
|
write_drc_triangle(drc.string(), draco::GeometryAttribute::POSITION, 200);
|
|
|
|
TriangleMesh mesh;
|
|
CHECK_FALSE(load_drc(drc.string().c_str(), &mesh));
|
|
}
|