From 5363dcb5bc6898aacf9bff327894f7e1a418dba2 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 24 Nov 2020 18:44:59 +0100 Subject: [PATCH] Fix broken arrange from 2f65bcc83ffe7a36455bf205e3427243540a337a --- .../include/libnest2d/placers/nfpplacer.hpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/libnest2d/include/libnest2d/placers/nfpplacer.hpp b/src/libnest2d/include/libnest2d/placers/nfpplacer.hpp index 7b4f36716..3554892b3 100644 --- a/src/libnest2d/include/libnest2d/placers/nfpplacer.hpp +++ b/src/libnest2d/include/libnest2d/placers/nfpplacer.hpp @@ -581,20 +581,6 @@ private: using Shapes = TMultiShape; - template - static Shapes calcnfp(const Shapes &pile, const RawShape &orb) - { - Shapes ret; ret.reserve(2 * pile.size()); - - for (auto &stat : pile) { - Shapes subnfp = nfp::noFitPolygon(stat, orb); - for (auto &nfp : subnfp) - ret.emplace_back(subnfp); - } - - return nfp::merge(ret); - } - Shapes calcnfp(const Item &trsh, Lvl) { using namespace nfp; @@ -927,11 +913,11 @@ private: item.translation(final_tr); item.rotation(final_rot); - merged_pile_ = nfp::merge(merged_pile, item.transformedShape()); } if(can_pack) { ret = PackResult(item); + merged_pile_ = nfp::merge(merged_pile_, item.transformedShape()); } else { ret = PackResult(best_overfit); }