mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 14:20:58 +00:00
HanifKoh
8ffd3e514e
* Validate OBJ Texture-Coordinate Indices load_obj read the texture coordinates of a face without checking the vt index, so a face referencing a vt past the end of the list read out of bounds and crashed, and a face vertex with no vt read index -1. Out-of-range or missing indices now fall back to a zero UV. The face keeps its entry in the per-face UV list, so the following faces stay aligned, and the geometry loads as before. Negative (relative) vt indices were also rebased by dividing the float count by 3, but each vt stores two floats. * Reject DRC Meshes Without Positions or with Invalid Face Indices load_drc dereferenced the POSITION attribute without checking that the mesh has one, and trusted the decoded face indices, which the Draco decoder does not check against the point count. Both now fail the load cleanly. A failed vertex conversion is treated the same way. The libslic3r tests link Draco so they can encode the malformed meshes in-test. * Keep OBJ Texture Coordinates That Carry a W Component The vt parser stopped reading the optional third component when texture coordinates were cut down to u and v, but the check that nothing is left on the line stayed. A legal "vt u v w" line was therefore rejected and silently dropped, shifting every later texture index. The w component is parsed again and discarded. The texture coordinate stride is now a named constant, OBJ_TEXCOORD_LENGTH, used by the parser and the importer, so the relative-index rebase cannot drift from the storage layout again.
72 lines
2.3 KiB
C++
72 lines
2.3 KiB
C++
#include <catch2/catch_all.hpp>
|
|
|
|
#include "libslic3r/Format/DRC.hpp"
|
|
#include "libslic3r/TriangleMesh.hpp"
|
|
|
|
#include <boost/nowide/fstream.hpp>
|
|
|
|
#include <draco/compression/encode.h>
|
|
#include <draco/mesh/mesh.h>
|
|
|
|
#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));
|
|
}
|