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

Refinements for small item arrangement using the increased cpu power.

Browse Source
This commit is contained in:
tamasmeszaros 2018-09-07 12:03:49 +02:00
parent ec3e1403b6
commit 1acee89006
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xs/src/libslic3r/ModelArrange.hpp
View File

@ -130,6 +130,7 @@ objfunc(const PointImpl& bincenter,
double norm, // A norming factor for physical dimensions double norm, // A norming factor for physical dimensions
// a spatial index to quickly get neighbors of the candidate item // a spatial index to quickly get neighbors of the candidate item
const SpatIndex& spatindex, const SpatIndex& spatindex,
const SpatIndex& smalls_spatindex,
const ItemGroup& remaining const ItemGroup& remaining
) )
{ {
@ -161,7 +162,7 @@ objfunc(const PointImpl& bincenter,
// Will hold the resulting score // Will hold the resulting score
double score = 0; double score = 0;
if(isBig(item.area())) { if(isBig(item.area()) || spatindex.empty()) {
// This branch is for the bigger items.. // This branch is for the bigger items..
auto minc = ibb.minCorner(); // bottom left corner auto minc = ibb.minCorner(); // bottom left corner
@ -183,6 +184,8 @@ objfunc(const PointImpl& bincenter,
// The smalles distance from the arranged pile center: // The smalles distance from the arranged pile center:
auto dist = *(std::min_element(dists.begin(), dists.end())) / norm; auto dist = *(std::min_element(dists.begin(), dists.end())) / norm;
auto bindist = pl::distance(ibb.center(), bincenter) / norm;
dist = 0.8*dist + 0.2*bindist;
// Density is the pack density: how big is the arranged pile // Density is the pack density: how big is the arranged pile
double density = 0; double density = 0;
@ -207,14 +210,20 @@ objfunc(const PointImpl& bincenter,
// candidate to be aligned with only one item. // candidate to be aligned with only one item.
auto alignment_score = 1.0; auto alignment_score = 1.0;
density = (fullbb.width()*fullbb.height()) / (norm*norm); density = std::sqrt((fullbb.width() / norm )*
(fullbb.height() / norm));
auto querybb = item.boundingBox(); auto querybb = item.boundingBox();
// Query the spatial index for the neighbors // Query the spatial index for the neighbors
std::vector<SpatElement> result; std::vector<SpatElement> result;
result.reserve(spatindex.size()); result.reserve(spatindex.size());
spatindex.query(bgi::intersects(querybb), if(isBig(item.area())) {
std::back_inserter(result)); spatindex.query(bgi::intersects(querybb),
std::back_inserter(result));
} else {
smalls_spatindex.query(bgi::intersects(querybb),
std::back_inserter(result));
}
for(auto& e : result) { // now get the score for the best alignment for(auto& e : result) { // now get the score for the best alignment
auto idx = e.second; auto idx = e.second;
@ -235,12 +244,8 @@ objfunc(const PointImpl& bincenter,
if(result.empty()) if(result.empty())
score = 0.5 * dist + 0.5 * density; score = 0.5 * dist + 0.5 * density;
else else
score = 0.45 * dist + 0.45 * density + 0.1 * alignment_score; score = 0.40 * dist + 0.40 * density + 0.2 * alignment_score;
} }
} else if( !isBig(item.area()) && spatindex.empty()) {
auto bindist = pl::distance(ibb.center(), bincenter) / norm;
// Bindist is surprisingly enough...
score = bindist;
} else { } else {
// Here there are the small items that should be placed around the // Here there are the small items that should be placed around the
// already processed bigger items. // already processed bigger items.
@ -291,6 +296,7 @@ protected:
PConfig pconf_; // Placement configuration PConfig pconf_; // Placement configuration
double bin_area_; double bin_area_;
SpatIndex rtree_; SpatIndex rtree_;
SpatIndex smallsrtree_;
double norm_; double norm_;
Pile merged_pile_; Pile merged_pile_;
Box pilebb_; Box pilebb_;
@ -317,6 +323,7 @@ public:
pilebb_ = sl::boundingBox(merged_pile); pilebb_ = sl::boundingBox(merged_pile);
rtree_.clear(); rtree_.clear();
smallsrtree_.clear();
// We will treat big items (compared to the print bed) differently // We will treat big items (compared to the print bed) differently
auto isBig = [this](double a) { auto isBig = [this](double a) {
@ -326,6 +333,7 @@ public:
for(unsigned idx = 0; idx < items.size(); ++idx) { for(unsigned idx = 0; idx < items.size(); ++idx) {
Item& itm = items[idx]; Item& itm = items[idx];
if(isBig(itm.area())) rtree_.insert({itm.boundingBox(), idx}); if(isBig(itm.area())) rtree_.insert({itm.boundingBox(), idx});
smallsrtree_.insert({itm.boundingBox(), idx});
} }
}; };
@ -357,6 +365,7 @@ public:
bin_area_, bin_area_,
norm_, norm_,
rtree_, rtree_,
smallsrtree_,
remaining_); remaining_);
double score = std::get<0>(result); double score = std::get<0>(result);
@ -393,6 +402,7 @@ public:
bin_area_, bin_area_,
norm_, norm_,
rtree_, rtree_,
smallsrtree_,
remaining_); remaining_);
double score = std::get<0>(result); double score = std::get<0>(result);
@ -435,6 +445,7 @@ public:
bin_area_, bin_area_,
norm_, norm_,
rtree_, rtree_,
smallsrtree_,
remaining_); remaining_);
double score = std::get<0>(result); double score = std::get<0>(result);
@ -462,6 +473,7 @@ public:
0, 0,
norm_, norm_,
rtree_, rtree_,
smallsrtree_,
remaining_); remaining_);
return std::get<0>(result); return std::get<0>(result);
}; };