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

Fix arrange for large beds

Browse source
This commit is contained in:
tamasmeszaros 2020-03-30 13:26:24 +02:00
parent ec86d94f02
commit 70baa0d246
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Model.cpp
View file

@ -419,7 +419,7 @@ bool Model::arrange_objects(coordf_t dist, const BoundingBoxf* bb)
if (input[i].bed_idx != 0) ret = false;
if (input[i].bed_idx >= 0) {
input[i].translation += Vec2crd{input[i].bed_idx * stride, 0};
instances[i]->apply_arrange_result(input[i].translation,
instances[i]->apply_arrange_result(input[i].translation.cast<double>(),
input[i].rotation);
}
}

2
src/libslic3r/Model.hpp
View file

@ -668,7 +668,7 @@ public:
arrangement::ArrangePolygon get_arrange_polygon() const;
// Apply the arrange result on the ModelInstance
void apply_arrange_result(const Vec2crd& offs, double rotation)
void apply_arrange_result(const Vec2d& offs, double rotation)
{
// write the transformation data into the model instance
set_rotation(Z, rotation);

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

@ -1489,7 +1489,7 @@ struct Plater::priv
friend priv;
public:
void apply_arrange_result(const Vec2crd& tr, double rotation)
void apply_arrange_result(const Vec2d& tr, double rotation)
{
m_pos = unscaled(tr); m_rotation = rotation;
apply_wipe_tower();
@ -1604,7 +1604,7 @@ struct Plater::priv
ap.bed_idx = ap.translation.x() / bed_stride();
ap.setter = [obj, this](const ArrangePolygon &p) {
if (p.is_arranged()) {
auto t = p.translation;
Vec2d t = p.translation.cast<double>();
t.x() += p.bed_idx * bed_stride();
obj->apply_arrange_result(t, p.rotation);
}
@ -2861,7 +2861,7 @@ void Plater::priv::find_new_position(const ModelInstancePtrs &instances,
for (size_t i = 0; i < instances.size(); ++i)
if (movable[i].bed_idx == 0)
instances[i]->apply_arrange_result(movable[i].translation,
instances[i]->apply_arrange_result(movable[i].translation.cast<double>(),
movable[i].rotation);
}