From 4e3893a6e3810c1b228119dfb29964ec172149c2 Mon Sep 17 00:00:00 2001 From: "maosheng.wei" Date: Mon, 9 Sep 2024 10:22:40 +0800 Subject: [PATCH] NEW: add double tear romboid cylinder stl github: #4023 Website platform: Printables File Source: https://www.printables.com/model/769742-negative-volume-double-tear-romboid-cylinder-for-h Author: Ro3Deee@Ro3Deee Change-Id: I118031d5ca6663cca6e92dc33988d63b0ae9cd02 --- .../model/double_tear_romboid_cylinder.png | Bin 0 -> 4794 bytes .../model/double_tear_romboid_cylinder.stl | Bin 0 -> 19084 bytes src/slic3r/GUI/GUI_Factories.cpp | 4 ++-- src/slic3r/GUI/GUI_ObjectList.cpp | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 resources/model/double_tear_romboid_cylinder.png create mode 100644 resources/model/double_tear_romboid_cylinder.stl diff --git a/resources/model/double_tear_romboid_cylinder.png b/resources/model/double_tear_romboid_cylinder.png new file mode 100644 index 0000000000000000000000000000000000000000..e9c03485e2823fa4d88bb77e2b547098f33eb834 GIT binary patch literal 4794 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 literal 0 HcmV?d00001 diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index d204721fe..9db80b5d8 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -488,9 +488,9 @@ wxMenu* MenuFactory::append_submenu_add_generic(wxMenu* menu, ModelVolumeType ty sub_menu->AppendSeparator(); } - std::vector icons = { "Cube", "Cylinder", "Sphere", "Cone", "Disc", "Torus", "rounded_rectangle" }; + std::vector icons = {"Cube", "Cylinder", "Sphere", "Cone", "double_tear_romboid_cylinder", "Disc", "Torus", "rounded_rectangle"}; size_t i = 0; - for (auto &item : {L("Cube"), L("Cylinder"), L("Sphere"), L("Cone"), L("Disc"),L("Torus"),L("Rounded Rectangle") }) + for (auto &item : {L("Cube"), L("Cylinder"), L("Sphere"), L("Cone"), L("Double Tear Romboid Cylinder"), L("Disc"), L("Torus"), L("Rounded Rectangle")}) { append_menu_item(sub_menu, wxID_ANY, _(item), "", [type, item](wxCommandEvent&) { obj_list()->load_generic_subobject(item, type); }, Slic3r::resources_dir() + "/model/" + icons[i++] + ".png", menu); diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index bdf296b9e..39cb79464 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -2114,6 +2114,8 @@ static TriangleMesh create_mesh(const std::string& type_name, const BoundingBoxf 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.ReadSTLFile((Slic3r::resources_dir() + "/model/cone.stl").c_str(), true, nullptr); + else if (type_name == "Double Tear Romboid Cylinder") + mesh.ReadSTLFile((Slic3r::resources_dir() + "/model/double_tear_romboid_cylinder.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")