From 499106aafa92ca08076e958806c9c1417f96175f Mon Sep 17 00:00:00 2001 From: Arthur Date: Thu, 28 Dec 2023 18:12:02 +0800 Subject: [PATCH] ENH: use a better cone model The cone made from its_make_cone has issue with mesh boolean. Now we copy cone.stl from Prusa. Thanks. jira: none Change-Id: Ie90132f0676dda1c937093e167f40376c61c8a6f (cherry picked from commit 8d2261077f105a80a185b8d8011d1e3098d174bd) --- resources/model/cone.stl | Bin 0 -> 25584 bytes src/slic3r/GUI/GUI_ObjectList.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 resources/model/cone.stl diff --git a/resources/model/cone.stl b/resources/model/cone.stl new file mode 100644 index 0000000000000000000000000000000000000000..f75c6d7720d33bf4ec25973bbeb773b5ecd8d7ba GIT binary patch literal 25584 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 literal 0 HcmV?d00001 diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 73f1e369e..d0147587e 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -2083,7 +2083,7 @@ static TriangleMesh create_mesh(const std::string& type_name, const BoundingBoxf // Sitting on the print bed, left front front corner at (0, 0). mesh = TriangleMesh(its_make_cube(bb.size().x() * 1.5, bb.size().y() * 1.5, bb.size().z() * 0.5)); else if (type_name == "Cone") - mesh = TriangleMesh(its_make_cone(0.5 * side, side)); + mesh.ReadSTLFile((Slic3r::resources_dir() + "/model/cone.stl").c_str(), true, nullptr); else if (type_name == "Disc") mesh.ReadSTLFile((Slic3r::resources_dir() + "/model/Disc.stl").c_str(), true, nullptr); else if (type_name == "Torus")