diff options
author | enricoturri1966 <enricoturri@seznam.cz> | 2020-06-04 14:57:39 +0300 |
---|---|---|
committer | enricoturri1966 <enricoturri@seznam.cz> | 2020-06-04 14:57:39 +0300 |
commit | c3d643ead382deee9f8c49586ef2e35c716fb8d9 (patch) | |
tree | fe576a50f904e926178b26b76aa8ace786269609 /tests | |
parent | 7b33e780a2cf86b819dd6839844142111904efad (diff) | |
parent | 1e5d1cb616742ef64070ae93d8acf3c722612993 (diff) |
Fixed conflicts after merge with master
Diffstat (limited to 'tests')
-rw-r--r-- | tests/sla_print/sla_raycast_tests.cpp | 3 | ||||
-rw-r--r-- | tests/sla_print/sla_test_utils.cpp | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/sla_print/sla_raycast_tests.cpp b/tests/sla_print/sla_raycast_tests.cpp index 74c799472..c82e4569a 100644 --- a/tests/sla_print/sla_raycast_tests.cpp +++ b/tests/sla_print/sla_raycast_tests.cpp @@ -39,7 +39,7 @@ TEST_CASE("Raycaster - find intersections of a line and cylinder") REQUIRE(std::abs(out[1].first - std::sqrt(72.f)) < 0.001f); } - +#ifdef SLIC3R_HOLE_RAYCASTER // Create a simple scene with a 20mm cube and a big hole in the front wall // with 5mm radius. Then shoot rays from interesting positions and see where // they land. @@ -94,3 +94,4 @@ TEST_CASE("Raycaster with loaded drillholes", "[sla_raycast]") // Check for support tree correctness test_support_model_collision("20mm_cube.obj", {}, hcfg, holes); } +#endif diff --git a/tests/sla_print/sla_test_utils.cpp b/tests/sla_print/sla_test_utils.cpp index 883e4268a..1eaf796c0 100644 --- a/tests/sla_print/sla_test_utils.cpp +++ b/tests/sla_print/sla_test_utils.cpp @@ -105,8 +105,13 @@ void test_supports(const std::string &obj_filename, // Create the special index-triangle mesh with spatial indexing which // is the input of the support point and support mesh generators sla::EigenMesh3D emesh{mesh}; + +#ifdef SLIC3R_HOLE_RAYCASTER if (hollowingcfg.enabled) emesh.load_holes(drainholes); +#endif + + // TODO: do the cgal hole cutting... // Create the support point generator sla::SupportPointGenerator::Config autogencfg; |