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

Slic3r compiles with the new slice index interface.

Browse source
This commit is contained in:
tamasmeszaros 2019-03-21 12:25:33 +01:00
parent 19a96336ff
commit d4dde12d0d
4 changed files with 172 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
src/libslic3r/SLAPrint.cpp
View file

@ -678,14 +678,7 @@ void SLAPrint::process()
po.m_slice_index.emplace_back(slh(h), h - flh / 2.f, flh); po.m_slice_index.emplace_back(slh(h), h - flh / 2.f, flh);
} }
auto slindex_it = po.search_slice_index(float(bb3d.min(Z)));
using SlRec = SLAPrintObject::SliceRecord;
auto slindex_it = std::lower_bound(po.m_slice_index.begin(),
po.m_slice_index.end(),
float(bb3d.min(Z)), // model start z
[](const SlRec& sr1, const SlRec& sr2){
return sr1.slice_level() < sr2.slice_level();
});
if(slindex_it == po.m_slice_index.end()) if(slindex_it == po.m_slice_index.end())
throw std::runtime_error(L("Slicing had to be stopped " throw std::runtime_error(L("Slicing had to be stopped "
@ -715,7 +708,7 @@ void SLAPrint::process()
// In this step we check the slices, identify island and cover them with // In this step we check the slices, identify island and cover them with
// support points. Then we sprinkle the rest of the mesh. // support points. Then we sprinkle the rest of the mesh.
auto support_points = [this, ilh](SLAPrintObject& po) { auto support_points = [this](SLAPrintObject& po) {
const ModelObject& mo = *po.m_model_object; const ModelObject& mo = *po.m_model_object;
po.m_supportdata.reset( po.m_supportdata.reset(
new SLAPrintObject::SupportData(po.transformed_mesh()) ); new SLAPrintObject::SupportData(po.transformed_mesh()) );
@ -732,8 +725,7 @@ void SLAPrint::process()
if (mo.sla_points_status != sla::PointsStatus::UserModified) { if (mo.sla_points_status != sla::PointsStatus::UserModified) {
// calculate heights of slices (slices are calculated already) // calculate heights of slices (slices are calculated already)
auto&& bb = po.transformed_mesh().bounding_box(); const std::vector<float>& heights = po.m_height_levels;
std::vector<float> heights = po.get_slice_levels(float(bb.min(Z)));
this->throw_if_canceled(); this->throw_if_canceled();
SLAAutoSupports::Config config; SLAAutoSupports::Config config;
@ -896,7 +888,7 @@ void SLAPrint::process()
// We have the layer polygon collection but we need to unite them into // We have the layer polygon collection but we need to unite them into
// an index where the key is the height level in discrete levels (clipper) // an index where the key is the height level in discrete levels (clipper)
auto index_slices = [this, ilhd](SLAPrintObject& po) { auto index_slices = [this/*, ilhd*/](SLAPrintObject& /*po*/) {
// po.m_slice_index.clear(); // po.m_slice_index.clear();
// auto sih = LevelID(scale_(ilhd)); // auto sih = LevelID(scale_(ilhd));
@ -978,6 +970,19 @@ void SLAPrint::process()
m_printer_input.clear(); m_printer_input.clear();
for(SLAPrintObject * o : m_objects) { for(SLAPrintObject * o : m_objects) {
LevelID gndlvl = o->get_slice_index().front().key();
for(auto& slicerecord : o->get_slice_index()) {
auto& lyrs = m_printer_input[slicerecord.key() - gndlvl];
auto objslit = slicerecord.get_slices(*o, soModel);
auto supslit = slicerecord.get_slices(*o, soSupport);
if(objslit != o->get_model_slices().end())
lyrs.emplace_back(*objslit, o->instances());
if(supslit != o->get_support_slices().end())
lyrs.emplace_back(*supslit, o->instances());
}
// auto& po = *o; // auto& po = *o;
// std::vector<ExPolygons>& oslices = po.m_model_slices; // std::vector<ExPolygons>& oslices = po.m_model_slices;
@ -1003,8 +1008,6 @@ void SLAPrint::process()
// m_printer_input[gndlvl + po.m_supportdata->level_ids[i]]; // m_printer_input[gndlvl + po.m_supportdata->level_ids[i]];
// lyrs.emplace_back(sslices[i], po.m_instances); // lyrs.emplace_back(sslices[i], po.m_instances);
// } // }
// for(size_t i = 0; i < o->m_sli)
} }
// collect all the keys // collect all the keys
@ -1306,13 +1309,13 @@ void SLAPrint::fill_statistics()
// find highest object // find highest object
// Which is a better bet? To compare by max_z or by number of layers in the index? // Which is a better bet? To compare by max_z or by number of layers in the index?
double max_z = 0.; float max_z = 0.;
size_t max_layers_cnt = 0; size_t max_layers_cnt = 0;
size_t highest_obj_idx = 0; size_t highest_obj_idx = 0;
for (SLAPrintObject *&po : m_objects) { for (SLAPrintObject *&po : m_objects) {
const SLAPrintObject::SliceIndex& slice_index = po->get_slice_index(); const SLAPrintObject::SliceIndex& slice_index = po->get_slice_index();
if (! slice_index.empty()) { if (! slice_index.empty()) {
double z = (-- slice_index.end())->first; float z = (-- slice_index.end())->slice_level();
size_t cnt = slice_index.size(); size_t cnt = slice_index.size();
//if (z > max_z) { //if (z > max_z) {
if (cnt > max_layers_cnt) { if (cnt > max_layers_cnt) {
@ -1332,7 +1335,7 @@ void SLAPrint::fill_statistics()
int sliced_layer_cnt = 0; int sliced_layer_cnt = 0;
for (const auto& layer : highest_obj_slice_index) for (const auto& layer : highest_obj_slice_index)
{ {
const double l_height = (layer.first == highest_obj_slice_index.begin()->first) ? init_layer_height : layer_height; const double l_height = (layer.key() == highest_obj_slice_index.begin()->key()) ? init_layer_height : layer_height;
// Calculation of the consumed material // Calculation of the consumed material
@ -1344,18 +1347,19 @@ void SLAPrint::fill_statistics()
const SLAPrintObject::SliceRecord *record = nullptr; const SLAPrintObject::SliceRecord *record = nullptr;
{ {
const SLAPrintObject::SliceIndex& index = po->get_slice_index(); const SLAPrintObject::SliceIndex& index = po->get_slice_index();
auto key = layer.first; auto it = po->search_slice_index(layer.slice_level() - float(EPSILON));
const SLAPrintObject::SliceIndex::const_iterator it_key = index.lower_bound(key - float(EPSILON)); if (it == index.end() || it->slice_level() > layer.slice_level() + float(EPSILON))
if (it_key == index.end() || it_key->first > key + EPSILON)
continue; continue;
record = &it_key->second; record = &(*it);
} }
if (record->model_slices_idx != SLAPrintObject::SliceRecord::NONE) auto modelslice_it = record->get_slices(*po, soModel);
append(model_polygons, get_all_polygons(po->get_model_slices()[record->model_slices_idx], po->instances())); if (modelslice_it != po->get_model_slices().end())
append(model_polygons, get_all_polygons(*modelslice_it, po->instances()));
if (record->support_slices_idx != SLAPrintObject::SliceRecord::NONE) auto supportslice_it = record->get_slices(*po, soSupport);
append(supports_polygons, get_all_polygons(po->get_support_slices()[record->support_slices_idx], po->instances())); if (supportslice_it != po->get_support_slices().end())
append(supports_polygons, get_all_polygons(*supportslice_it, po->instances()));
} }
model_polygons = union_(model_polygons); model_polygons = union_(model_polygons);
@ -1562,15 +1566,74 @@ const std::vector<sla::SupportPoint>& SLAPrintObject::get_support_points() const
return m_supportdata->support_points; return m_supportdata->support_points;
} }
SLAPrintObject::SliceIndex::iterator
SLAPrintObject::search_slice_index(float slice_level)
{
SliceRecord query(0, slice_level, 0);
auto it = std::lower_bound(m_slice_index.begin(), m_slice_index.end(),
query,
[](const SliceRecord& r1, const SliceRecord& r2)
{
return r1.slice_level() < r2.slice_level();
});
return it;
}
SLAPrintObject::SliceIndex::const_iterator
SLAPrintObject::search_slice_index(float slice_level) const
{
SliceRecord query(0, slice_level, 0);
auto it = std::lower_bound(m_slice_index.cbegin(), m_slice_index.cend(),
query,
[](const SliceRecord& r1, const SliceRecord& r2)
{
return r1.slice_level() < r2.slice_level();
});
return it;
}
SLAPrintObject::SliceIndex::iterator
SLAPrintObject::search_slice_index(SLAPrintObject::SliceRecord::Key key)
{
SliceRecord query(key, 0.f, 0.f);
auto it = std::lower_bound(m_slice_index.begin(), m_slice_index.end(),
query,
[](const SliceRecord& r1, const SliceRecord& r2)
{
return r1.key() < r2.key();
});
// Return valid iterator only if the keys really match
if(it != m_slice_index.end() && it->key() != key) it = m_slice_index.end();
return it;
}
SLAPrintObject::SliceIndex::const_iterator
SLAPrintObject::search_slice_index(SLAPrintObject::SliceRecord::Key key) const
{
SliceRecord query(key, 0.f, 0.f);
auto it = std::lower_bound(m_slice_index.cbegin(), m_slice_index.cend(),
query,
[](const SliceRecord& r1, const SliceRecord& r2)
{
return r1.key() < r2.key();
});
// Return valid iterator only if the keys really match
if(it != m_slice_index.end() && it->key() != key) it = m_slice_index.end();
return it;
}
SliceIterator SLAPrintObject::get_slices(SliceOrigin so, LevelID k) const SliceIterator SLAPrintObject::get_slices(SliceOrigin so, LevelID k) const
{ {
SliceIterator ret = so == soModel ? get_model_slices().end() : SliceIterator ret = so == soModel ? get_model_slices().end() :
get_support_slices().end(); get_support_slices().end();
auto it = std::lower_bound(m_slice_index.begin(), auto it = search_slice_index(k);
m_slice_index.end(),
k,
SliceRecord::cmpfn);
if(it != m_slice_index.end()) { if(it != m_slice_index.end()) {
ret = it->get_slices(*this, so); ret = it->get_slices(*this, so);
@ -1603,20 +1666,22 @@ SLAPrintObject::get_slice_index() const
return m_slice_index; return m_slice_index;
} }
std::vector<float> SLAPrintObject::get_slice_levels(float from_eq) const //std::vector<float> SLAPrintObject::get_slice_levels(float from_eq) const
{ //{
using SlRec = SLAPrintObject::SliceRecord; // using SlRec = SLAPrintObject::SliceRecord;
auto it = std::lower_bound(m_slice_index.begin(), // auto it = std::lower_bound(m_slice_index.begin(),
m_slice_index.end(), // m_slice_index.end(),
from_eq, // model start z // from_eq, // model start z
[](const SlRec& sr1, const SlRec& sr2){ // [](const SlRec& sr1, const SlRec& sr2){
return sr1.slice_level() < sr2.slice_level(); // return sr1.slice_level() < sr2.slice_level();
}); // });
std::vector<float> heights; heights.reserve(m_slice_index.size()); // std::vector<float> heights; heights.reserve(m_slice_index.size());
for(; it != m_slice_index.end(); ++it) // for(; it != m_slice_index.end(); ++it)
heights.emplace_back(it->slice_level()); // heights.emplace_back(it->slice_level());
}
//}
const std::vector<ExPolygons> &SLAPrintObject::get_model_slices() const const std::vector<ExPolygons> &SLAPrintObject::get_model_slices() const
{ {
@ -1742,7 +1807,7 @@ SliceIterator SLAPrintObject::SliceRecord::get_slices(const SLAPrintObject &po,
const std::vector<ExPolygons>& v = so == soModel? po.get_model_slices() : const std::vector<ExPolygons>& v = so == soModel? po.get_model_slices() :
po.get_support_slices(); po.get_support_slices();
Idx idx = so == soModel ? m_model_slices_idx : m_support_slices_idx; size_t idx = so == soModel ? m_model_slices_idx : m_support_slices_idx;
using DiffT = std::vector<ExPolygons>::const_iterator::difference_type; using DiffT = std::vector<ExPolygons>::const_iterator::difference_type;

32
src/libslic3r/SLAPrint.hpp
View file

@ -46,7 +46,7 @@ template<class It> struct Range {
from(std::forward<It>(b)), to(std::forward<It>(e)) {} from(std::forward<It>(b)), to(std::forward<It>(e)) {}
}; };
enum SliceOrigin { soSlice, soModel }; enum SliceOrigin { soSupport, soModel };
using SliceStore = std::vector<ExPolygons>; using SliceStore = std::vector<ExPolygons>;
using SliceIterator = SliceStore::const_iterator; using SliceIterator = SliceStore::const_iterator;
@ -118,25 +118,19 @@ private:
using Key = LevelID; using Key = LevelID;
private: private:
using Idx = size_t; static const size_t NONE = size_t(-1); // this will be the max limit of size_t
static const Idx NONE = Idx(-1); // this will be the max limit of size_t size_t m_model_slices_idx = NONE;
size_t m_support_slices_idx = NONE;
LevelID m_print_z = 0; // Top of the layer LevelID m_print_z = 0; // Top of the layer
float m_slice_z = 0.f; // Exact level of the slice float m_slice_z = 0.f; // Exact level of the slice
float m_height = 0.f; // Height of the sliced layer float m_height = 0.f; // Height of the sliced layer
Idx m_model_slices_idx = NONE;
Idx m_support_slices_idx = NONE;
public: public:
SliceRecord(Key key, float slicez, float height): SliceRecord(Key key, float slicez, float height):
m_print_z(key), m_slice_z(slicez), m_height(height) {} m_print_z(key), m_slice_z(slicez), m_height(height) {}
inline static bool cmpfn(const SliceRecord& sr1, const SliceRecord& sr2)
{
return sr1.key() < sr2.key();
}
inline Key key() const { return m_print_z; } inline Key key() const { return m_print_z; }
inline float slice_level() const { return m_slice_z; } inline float slice_level() const { return m_slice_z; }
inline float layer_height() const { return m_height; } inline float layer_height() const { return m_height; }
@ -144,16 +138,22 @@ private:
SliceIterator get_slices(const SLAPrintObject& po, SliceIterator get_slices(const SLAPrintObject& po,
SliceOrigin so) const; SliceOrigin so) const;
void set_model_slice_idx(Idx id) { m_model_slices_idx = id; }
void set_support_slice_idx(Idx id) { m_support_slices_idx = id; } void set_model_slice_idx(size_t id) { m_model_slices_idx = id; }
void set_support_slice_idx(size_t id) { m_support_slices_idx = id; }
}; };
using SliceIndex = std::vector<SliceRecord>;
// Retrieve the slice index which is readable only after slaposIndexSlices // Retrieve the slice index which is readable only after slaposIndexSlices
// is done. // is done.
const std::vector<SliceRecord>& get_slice_index() const; const SliceIndex& get_slice_index() const;
std::vector<float> get_slice_levels(float from_eq) const; SliceIndex::iterator search_slice_index(float slice_level);
SliceIndex::const_iterator search_slice_index(float slice_level) const;
SliceIndex::iterator search_slice_index(SliceRecord::Key key);
SliceIndex::const_iterator search_slice_index(SliceRecord::Key key) const;
public: public:
@ -171,6 +171,10 @@ public:
const std::vector<ExPolygons>& get_model_slices() const; const std::vector<ExPolygons>& get_model_slices() const;
const std::vector<ExPolygons>& get_support_slices() const; const std::vector<ExPolygons>& get_support_slices() const;
inline const std::vector<float>& get_height_levels() const {
return m_height_levels;
}
protected: protected:
// to be called from SLAPrint only. // to be called from SLAPrint only.
friend class SLAPrint; friend class SLAPrint;

66
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -4937,32 +4937,52 @@ void GLCanvas3D::_render_sla_slices() const
if ((bottom_obj_triangles.empty() || bottom_sup_triangles.empty() || top_obj_triangles.empty() || top_sup_triangles.empty()) && obj->is_step_done(slaposIndexSlices)) if ((bottom_obj_triangles.empty() || bottom_sup_triangles.empty() || top_obj_triangles.empty() || top_sup_triangles.empty()) && obj->is_step_done(slaposIndexSlices))
{ {
const std::vector<ExPolygons>& model_slices = obj->get_model_slices(); // FIXME: is this all right (by Tamas)?
const std::vector<ExPolygons>& support_slices = obj->get_support_slices(); SliceRange model_slices = obj->get_slices(soModel, float(min_z), float(max_z));
SliceRange support_slices = obj->get_slices(soSupport, float(min_z), float(max_z));
const SLAPrintObject::SliceIndex& index = obj->get_slice_index(); // calculate model bottom cap
SLAPrintObject::SliceIndex::const_iterator it_min_z = std::find_if(index.begin(), index.end(), [min_z](const SLAPrintObject::SliceIndex::value_type& id) -> bool { return std::abs(min_z - id.first) < EPSILON; }); if(bottom_obj_triangles.empty() && model_slices.from != obj->get_model_slices().end())
SLAPrintObject::SliceIndex::const_iterator it_max_z = std::find_if(index.begin(), index.end(), [max_z](const SLAPrintObject::SliceIndex::value_type& id) -> bool { return std::abs(max_z - id.first) < EPSILON; }); bottom_obj_triangles = triangulate_expolygons_3d(*model_slices.from, min_z, true);
if (it_min_z != index.end()) // calculate support bottom cap
{ if(bottom_sup_triangles.empty() && support_slices.from != obj->get_support_slices().end())
// calculate model bottom cap bottom_sup_triangles = triangulate_expolygons_3d(*support_slices.from, min_z, true);
if (bottom_obj_triangles.empty() && (it_min_z->second.model_slices_idx < model_slices.size()))
bottom_obj_triangles = triangulate_expolygons_3d(model_slices[it_min_z->second.model_slices_idx], min_z, true);
// calculate support bottom cap
if (bottom_sup_triangles.empty() && (it_min_z->second.support_slices_idx < support_slices.size()))
bottom_sup_triangles = triangulate_expolygons_3d(support_slices[it_min_z->second.support_slices_idx], min_z, true);
}
if (it_max_z != index.end()) // calculate model top cap
{ if(top_obj_triangles.empty() && model_slices.to != obj->get_model_slices().end())
// calculate model top cap top_obj_triangles = triangulate_expolygons_3d(*model_slices.to, max_z, true);
if (top_obj_triangles.empty() && (it_max_z->second.model_slices_idx < model_slices.size()))
top_obj_triangles = triangulate_expolygons_3d(model_slices[it_max_z->second.model_slices_idx], max_z, false); // calculate support top cap
// calculate support top cap if(top_sup_triangles.empty() && support_slices.to != obj->get_support_slices().end())
if (top_sup_triangles.empty() && (it_max_z->second.support_slices_idx < support_slices.size())) top_sup_triangles = triangulate_expolygons_3d(*support_slices.to, max_z, true);
top_sup_triangles = triangulate_expolygons_3d(support_slices[it_max_z->second.support_slices_idx], max_z, false);
} // const std::vector<ExPolygons>& model_slices = obj->get_model_slices();
// const std::vector<ExPolygons>& support_slices = obj->get_support_slices();
// const SLAPrintObject::SliceIndex& index = obj->get_slice_index();
// SLAPrintObject::SliceIndex::const_iterator it_min_z = std::find_if(index.begin(), index.end(), [min_z](const SLAPrintObject::SliceIndex::value_type& id) -> bool { return std::abs(min_z - id.first) < EPSILON; });
// SLAPrintObject::SliceIndex::const_iterator it_max_z = std::find_if(index.begin(), index.end(), [max_z](const SLAPrintObject::SliceIndex::value_type& id) -> bool { return std::abs(max_z - id.first) < EPSILON; });
// if (it_min_z != index.end())
// {
// // calculate model bottom cap
// if (bottom_obj_triangles.empty() && (it_min_z->second.model_slices_idx < model_slices.size()))
// bottom_obj_triangles = triangulate_expolygons_3d(model_slices[it_min_z->second.model_slices_idx], min_z, true);
// // calculate support bottom cap
// if (bottom_sup_triangles.empty() && (it_min_z->second.support_slices_idx < support_slices.size()))
// bottom_sup_triangles = triangulate_expolygons_3d(support_slices[it_min_z->second.support_slices_idx], min_z, true);
// }
// if (it_max_z != index.end())
// {
// // calculate model top cap
// if (top_obj_triangles.empty() && (it_max_z->second.model_slices_idx < model_slices.size()))
// top_obj_triangles = triangulate_expolygons_3d(model_slices[it_max_z->second.model_slices_idx], max_z, false);
// // calculate support top cap
// if (top_sup_triangles.empty() && (it_max_z->second.support_slices_idx < support_slices.size()))
// top_sup_triangles = triangulate_expolygons_3d(support_slices[it_max_z->second.support_slices_idx], max_z, false);
// }
} }
if (!bottom_obj_triangles.empty() || !top_obj_triangles.empty() || !bottom_sup_triangles.empty() || !top_sup_triangles.empty()) if (!bottom_obj_triangles.empty() || !top_obj_triangles.empty() || !bottom_sup_triangles.empty() || !top_sup_triangles.empty())

6
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -776,10 +776,10 @@ void Preview::load_print_as_sla()
double shift_z = obj->get_current_elevation(); double shift_z = obj->get_current_elevation();
if (obj->is_step_done(slaposIndexSlices)) if (obj->is_step_done(slaposIndexSlices))
{ {
const SLAPrintObject::SliceIndex& index = obj->get_slice_index(); const std::vector<float>& hlvls = obj->get_height_levels();
for (const SLAPrintObject::SliceIndex::value_type& id : index) for (float h : hlvls)
{ {
zs.insert(shift_z + id.first); zs.insert(shift_z + double(h));
} }
} }
} }