diff options
author | tamasmeszaros <meszaros.q@gmail.com> | 2019-07-22 12:18:10 +0300 |
---|---|---|
committer | tamasmeszaros <meszaros.q@gmail.com> | 2019-07-22 12:18:10 +0300 |
commit | 764efb1385a2ec644c1ec1b29a7e124cf256a8dc (patch) | |
tree | 1fcd812d0f64e26f22add4b42506f37bece3baf7 /src/libslic3r/Arrange.cpp | |
parent | dcb073d4fda256ab17cba4e3428b89154fa5ccc2 (diff) |
Remove disabled code.
Diffstat (limited to 'src/libslic3r/Arrange.cpp')
-rw-r--r-- | src/libslic3r/Arrange.cpp | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/src/libslic3r/Arrange.cpp b/src/libslic3r/Arrange.cpp index 77f4f55db..b4cfac954 100644 --- a/src/libslic3r/Arrange.cpp +++ b/src/libslic3r/Arrange.cpp @@ -136,9 +136,6 @@ protected: ItemGroup m_remaining; // Remaining items (m_items at the beginning) ItemGroup m_items; // The items to be packed - // Used only for preloading objects before arrange - // std::vector<SpatIndex> m_preload_idx; // spatial index for preloaded beds - template<class T> ArithmeticOnly<T, double> norm(T val) { return double(val) / m_norm; @@ -321,7 +318,6 @@ public: m_pilebb = sl::boundingBox(merged_pile); m_rtree.clear(); -// m_preload_idx.clear(); m_smallsrtree.clear(); // We will treat big items (compared to the print bed) differently @@ -362,25 +358,10 @@ public: for(unsigned idx = 0; idx < fixeditems.size(); ++idx) { Item& itm = fixeditems[idx]; itm.markAsFixed(); -// size_t bedidx = itm.binId() < 0 ? 0u : size_t(itm.binId()); - -// while (m_preload_idx.size() <= bedidx) m_preload_idx.emplace_back(); -// m_preload_idx[bedidx].insert({itm.boundingBox(), idx}); } m_pck.configure(m_pconf); } - -// int is_colliding(const Item& item) { -// size_t bedidx = item.binId() < 0 ? 0u : size_t(item.binId()); -// if (m_preload_idx.size() <= bedidx || m_preload_idx[bedidx].empty()) -// return false; - -// std::vector<SpatElement> result; -// m_preload_idx[bedidx].query(bgi::intersects(item.boundingBox()), -// std::back_inserter(result)); -// return !result.empty(); -// } }; template<> std::function<double(const Item&)> AutoArranger<Box>::get_objfn() @@ -544,21 +525,7 @@ void _arrange( ++it : it = excludes.erase(it); // If there is something on the plate - if (!excludes.empty()) { - arranger.preload(excludes); -// auto binbb = sl::boundingBox(corrected_bin); - -// // Try to put the first item to the center, as the arranger -// // will not do this for us. -// for (Item &itm : shapes) { -// auto ibb = itm.boundingBox(); -// auto d = binbb.center() - ibb.center(); -// itm.translate(d); -// itm.binId(UNARRANGED); - -// if (!arranger.is_colliding(itm)) { itm.markAsFixed(); break; } -// } - } + if (!excludes.empty()) arranger.preload(excludes); std::vector<std::reference_wrapper<Item>> inp; inp.reserve(shapes.size() + excludes.size()); |