3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Priority for wipe tower, Increased safety distance from bed edges.

Browse source 
* WipeTowerInfo class extended in plater (WipeTower) instead of GLCanvas3D
* Bed origin support in ModelInstance and WipeTower
This commit is contained in:
tamasmeszaros 2019-07-16 18:33:42 +02:00
parent 5446167c11
commit 44801f4429
9 changed files with 164 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libslic3r/Model.hpp
View file

@ -558,13 +558,15 @@ public:
arrangement::ArrangePolygon get_arrange_polygon() const;
// Apply the arrange result on the ModelInstance
void apply_arrange_result(Vec2crd offs, double rot_rads, int bed_idx = 0)
void apply_arrange_result(const arrangement::ArrangePolygon& ap,
const Vec2crd& bed_origin = {0, 0})
{
// write the transformation data into the model instance
set_rotation(Z, rot_rads);
set_offset(X, unscale<double>(offs(X)));
set_offset(Y, unscale<double>(offs(Y)));
m_arrange_cache.bed_idx = bed_idx;
set_rotation(Z, ap.rotation);
set_offset(X, unscale<double>(ap.translation(X) + bed_origin.x()));
set_offset(Y, unscale<double>(ap.translation(Y) + bed_origin.y()));
m_arrange_cache.bed_origin = bed_origin;
m_arrange_cache.bed_idx = ap.bed_idx;
}
protected:
@ -599,8 +601,9 @@ private:
// Warning! This object is not guarded against concurrency.
mutable struct ArrangeCache {
bool valid = false;
int bed_idx { arrangement::UNARRANGED };
Vec2crd bed_origin {0, 0};
ExPolygon poly;
int bed_idx = arrangement::UNARRANGED;
} m_arrange_cache;
};