diff --git a/resources/icons/bed/mk2_4096_bottom.png b/resources/icons/bed/mk2_4096_bottom.png deleted file mode 100644 index dcded1f7ee..0000000000 Binary files a/resources/icons/bed/mk2_4096_bottom.png and /dev/null differ diff --git a/resources/icons/bed/mk2_4096_top.png b/resources/icons/bed/mk2_4096_top.png deleted file mode 100644 index 1fe8c67060..0000000000 Binary files a/resources/icons/bed/mk2_4096_top.png and /dev/null differ diff --git a/resources/icons/bed/mk2_8192_bottom.png b/resources/icons/bed/mk2_8192_bottom.png deleted file mode 100644 index ccc83d3111..0000000000 Binary files a/resources/icons/bed/mk2_8192_bottom.png and /dev/null differ diff --git a/resources/icons/bed/mk2_8192_top.png b/resources/icons/bed/mk2_8192_top.png deleted file mode 100644 index 5e2ab6a500..0000000000 Binary files a/resources/icons/bed/mk2_8192_top.png and /dev/null differ diff --git a/resources/icons/bed/mk2_bottom.png b/resources/icons/bed/mk2_bottom.png deleted file mode 100644 index ed94b0d621..0000000000 Binary files a/resources/icons/bed/mk2_bottom.png and /dev/null differ diff --git a/resources/icons/bed/mk2_top.png b/resources/icons/bed/mk2_top.png deleted file mode 100644 index 63b034a996..0000000000 Binary files a/resources/icons/bed/mk2_top.png and /dev/null differ diff --git a/resources/icons/bed/mk3_4096_bottom.png b/resources/icons/bed/mk3_4096_bottom.png deleted file mode 100644 index 4a02aaefff..0000000000 Binary files a/resources/icons/bed/mk3_4096_bottom.png and /dev/null differ diff --git a/resources/icons/bed/mk3_4096_top.png b/resources/icons/bed/mk3_4096_top.png deleted file mode 100644 index a2a1824dd2..0000000000 Binary files a/resources/icons/bed/mk3_4096_top.png and /dev/null differ diff --git a/resources/icons/bed/mk3_8192_bottom.png b/resources/icons/bed/mk3_8192_bottom.png deleted file mode 100644 index aaa6243734..0000000000 Binary files a/resources/icons/bed/mk3_8192_bottom.png and /dev/null differ diff --git a/resources/icons/bed/mk3_8192_top.png b/resources/icons/bed/mk3_8192_top.png deleted file mode 100644 index 6b1e41e5c3..0000000000 Binary files a/resources/icons/bed/mk3_8192_top.png and /dev/null differ diff --git a/resources/icons/bed/mk3_bottom.png b/resources/icons/bed/mk3_bottom.png deleted file mode 100644 index f72cd93da9..0000000000 Binary files a/resources/icons/bed/mk3_bottom.png and /dev/null differ diff --git a/resources/icons/bed/mk3_top.png b/resources/icons/bed/mk3_top.png deleted file mode 100644 index e6f3261b52..0000000000 Binary files a/resources/icons/bed/mk3_top.png and /dev/null differ diff --git a/resources/icons/bed/sl1_4096_bottom.png b/resources/icons/bed/sl1_4096_bottom.png deleted file mode 100644 index 0998c0e3bf..0000000000 Binary files a/resources/icons/bed/sl1_4096_bottom.png and /dev/null differ diff --git a/resources/icons/bed/sl1_4096_top.png b/resources/icons/bed/sl1_4096_top.png deleted file mode 100644 index 7abd8b049e..0000000000 Binary files a/resources/icons/bed/sl1_4096_top.png and /dev/null differ diff --git a/resources/icons/bed/sl1_8192_bottom.png b/resources/icons/bed/sl1_8192_bottom.png deleted file mode 100644 index 4e38fc9204..0000000000 Binary files a/resources/icons/bed/sl1_8192_bottom.png and /dev/null differ diff --git a/resources/icons/bed/sl1_8192_top.png b/resources/icons/bed/sl1_8192_top.png deleted file mode 100644 index c01d59c7b4..0000000000 Binary files a/resources/icons/bed/sl1_8192_top.png and /dev/null differ diff --git a/resources/icons/bed/sl1_bottom.png b/resources/icons/bed/sl1_bottom.png deleted file mode 100644 index 04272ac22c..0000000000 Binary files a/resources/icons/bed/sl1_bottom.png and /dev/null differ diff --git a/resources/icons/bed/sl1_top.png b/resources/icons/bed/sl1_top.png deleted file mode 100644 index 49305f531f..0000000000 Binary files a/resources/icons/bed/sl1_top.png and /dev/null differ diff --git a/src/libslic3r/ModelArrange.cpp b/src/libslic3r/ModelArrange.cpp index fd3cf86489..4942e35b60 100644 --- a/src/libslic3r/ModelArrange.cpp +++ b/src/libslic3r/ModelArrange.cpp @@ -556,29 +556,7 @@ ShapeData2D projectModelFromTop(const Slic3r::Model &model) { // TODO export the exact 2D projection. Cannot do it as libnest2d // does not support concave shapes (yet). ClipperLib::Path clpath; -//WIP Vojtech's optimization of the calculation of the convex hull is not working correctly yet. -#if 1 - { - TriangleMesh rmesh = objptr->raw_mesh(); - ModelInstance * finst = objptr->instances.front(); - - // Object instances should carry the same scaling and - // x, y rotation that is why we use the first instance. - // The next line will apply only the full mirroring and scaling - rmesh.transform(finst->get_matrix(true, true, false, false)); - rmesh.rotate_x(float(finst->get_rotation()(X))); - rmesh.rotate_y(float(finst->get_rotation()(Y))); - - // TODO export the exact 2D projection. Cannot do it as libnest2d - // does not support concave shapes (yet). - auto p = rmesh.convex_hull(); - - p.make_clockwise(); - p.append(p.first_point()); - clpath = Slic3rMultiPoint_to_ClipperPath(p); - } -#else // Object instances should carry the same scaling and // x, y rotation that is why we use the first instance. { @@ -593,7 +571,6 @@ ShapeData2D projectModelFromTop(const Slic3r::Model &model) { p.append(p.first_point()); clpath = Slic3rMultiPoint_to_ClipperPath(p); } -#endif for(ModelInstance* objinst : objptr->instances) { if(objinst) {