diff options
author | enricoturri1966 <enricoturri@seznam.cz> | 2020-03-25 14:07:59 +0300 |
---|---|---|
committer | enricoturri1966 <enricoturri@seznam.cz> | 2020-03-25 14:07:59 +0300 |
commit | a1a4d49f15aab094a0de14f627557cbd6fd46179 (patch) | |
tree | de6f7a76eb3b6d8f1d83ea41c19c70da0ab5b214 /tests/fff_print | |
parent | 3b6d334d7bb0331e372cde14c69e153810fc0cbe (diff) | |
parent | de06c5d65950965f6a1fa5e55b7875ff9a3e4413 (diff) |
Fixed conflicts after merge with master
Diffstat (limited to 'tests/fff_print')
-rw-r--r-- | tests/fff_print/test_data.cpp | 2 | ||||
-rw-r--r-- | tests/fff_print/test_trianglemesh.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/fff_print/test_data.cpp b/tests/fff_print/test_data.cpp index 50b338325..06f2a6068 100644 --- a/tests/fff_print/test_data.cpp +++ b/tests/fff_print/test_data.cpp @@ -161,7 +161,7 @@ void init_print(std::vector<TriangleMesh> &&meshes, Slic3r::Print &print, Slic3r if (verbose_gcode()) config.set_key_value("gcode_comments", new ConfigOptionBool(true)); - for (const TriangleMesh &t : meshes) { + for (const TriangleMesh &t : meshes) { ModelObject *object = model.add_object(); object->name += "object.stl"; object->add_volume(std::move(t)); diff --git a/tests/fff_print/test_trianglemesh.cpp b/tests/fff_print/test_trianglemesh.cpp index 9598a3c5a..6b467a511 100644 --- a/tests/fff_print/test_trianglemesh.cpp +++ b/tests/fff_print/test_trianglemesh.cpp @@ -277,7 +277,6 @@ SCENARIO( "make_xxx functions produce meshes.") { GIVEN("make_sphere() function") { WHEN("make_sphere() is called with arguments 10, PI / 3") { TriangleMesh sph = make_sphere(10, PI / 243.0); - double angle = (2.0*PI / floor(2.0*PI / (PI / 243.0))); THEN("Resulting mesh has one point at 0,0,-10 and one at 0,0,10") { const std::vector<stl_vertex> &verts = sph.its.vertices; REQUIRE(std::count_if(verts.begin(), verts.end(), [](const Vec3f& t) { return is_approx(t, Vec3f(0.f, 0.f, 10.f)); } ) == 1); |