GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-17 09:15:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix seam placer when each object has its own layers

Browse Source 
use layer_z instead of layer_id
This commit is contained in:
supermerill 2021-09-26 23:38:34 +02:00
parent f138405bba
commit 9f9f544bb9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/GCode/SeamPlacer.cpp
View File

@ -863,14 +863,14 @@ void SeamPlacer::apply_custom_seam(const Polygon& polygon, size_t po_idx,
std::optional<Point> SeamHistory::get_last_seam(const PrintObject* po, size_t layer_id, const BoundingBox& island_bb) std::optional<Point> SeamHistory::get_last_seam(const PrintObject* po, coord_t layer_z, const BoundingBox& island_bb)
{ {
assert(layer_id >= m_layer_id); assert(layer_z >= m_layer_z);
if (layer_id > m_layer_id) { if (layer_z > m_layer_z) {
// Get seam was called for different layer than last time. // Get seam was called for different layer than last time.
m_data_last_layer = m_data_this_layer; m_data_last_layer = m_data_this_layer;
m_data_this_layer.clear(); m_data_this_layer.clear();
m_layer_id = layer_id; m_layer_z = layer_z;
} }
@ -918,7 +918,7 @@ void SeamHistory::add_seam(const PrintObject* po, const Point& pos, const Boundi
void SeamHistory::clear() void SeamHistory::clear()
{ {
m_layer_id = 0; m_layer_z = 0;
m_data_last_layer.clear(); m_data_last_layer.clear();
m_data_this_layer.clear(); m_data_this_layer.clear();
} }

4
src/libslic3r/GCode/SeamPlacer.hpp
View File

@ -20,7 +20,7 @@ namespace EdgeGrid { class Grid; }
class SeamHistory { class SeamHistory {
public: public:
SeamHistory() { clear(); } SeamHistory() { clear(); }
std::optional<Point> get_last_seam(const PrintObject* po, size_t layer_id, const BoundingBox& island_bb); std::optional<Point> get_last_seam(const PrintObject* po, coord_t layer_z, const BoundingBox& island_bb);
void add_seam(const PrintObject* po, const Point& pos, const BoundingBox& island_bb); void add_seam(const PrintObject* po, const Point& pos, const BoundingBox& island_bb);
void clear(); void clear();
@ -32,7 +32,7 @@ private:
std::map<const PrintObject*, std::vector<SeamPoint>> m_data_last_layer; std::map<const PrintObject*, std::vector<SeamPoint>> m_data_last_layer;
std::map<const PrintObject*, std::vector<SeamPoint>> m_data_this_layer; std::map<const PrintObject*, std::vector<SeamPoint>> m_data_this_layer;
size_t m_layer_id; coord_t m_layer_z;
}; };