3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing is_colliding and centering translation.

Browse Source
This commit is contained in:
tamasmeszaros 2019-01-23 10:37:37 +01:00
parent 05032d9760
commit f129a92405
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libslic3r/ModelArrange.cpp
View File

@ -375,10 +375,11 @@ public:
} }
bool is_colliding(const Item& item) { bool is_colliding(const Item& item) {
if(m_rtree.empty()) return false;
std::vector<SpatElement> result; std::vector<SpatElement> result;
m_rtree.query(bgi::intersects(item.boundingBox()), m_rtree.query(bgi::intersects(item.boundingBox()),
std::back_inserter(result)); std::back_inserter(result));
return result.empty(); return !result.empty();
} }
}; };
@ -870,7 +871,7 @@ void find_new_position(const Model &model,
// Try to place items to the center // Try to place items to the center
Item& itm = *shit; Item& itm = *shit;
auto ibb = itm.boundingBox(); auto ibb = itm.boundingBox();
auto d = ibb.center() - binbb.center(); auto d = binbb.center() - ibb.center();
itm.translate(d); itm.translate(d);
if(!arrange.is_colliding(itm)) { if(!arrange.is_colliding(itm)) {
arrange.preload({{itm}}); arrange.preload({{itm}});