amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
tamasmeszaros 2018-12-21 14:32:20 +01:00
commit fefa4ded00
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libslic3r/SLA/SLAAutoSupports.cpp
View file

@ -254,12 +254,11 @@ std::vector<Vec3d> SLAAutoSupports::uniformly_cover(const std::pair<ExPolygon, c
// In case there is just one point to place, we'll place it into the polygon's centroid (unless it lies in a hole). // In case there is just one point to place, we'll place it into the polygon's centroid (unless it lies in a hole).
if (num_of_points == 1) { if (num_of_points == 1) {
Point out(island.first.contour.centroid()); Point out(island.first.contour.centroid());
out(2) = island.second;
for (const auto& hole : island.first.holes) for (const auto& hole : island.first.holes)
if (hole.contains(out)) if (hole.contains(out))
goto HOLE_HIT; goto HOLE_HIT;
return std::vector<Vec3d>{unscale(out(0), out(1), out(2))}; return std::vector<Vec3d>{unscale(out(0), out(1), island.second)};
} }
HOLE_HIT: HOLE_HIT:
@ -296,11 +295,9 @@ HOLE_HIT:
} }
} }
} }
if (add_it) { if (add_it)
out(2) = island.second;
island_new_points.emplace_back(unscaled_out); island_new_points.emplace_back(unscaled_out);
} }
}
return island_new_points; return island_new_points;
} }

2
src/slic3r/GUI/GLGizmo.cpp
View file

@ -1466,6 +1466,7 @@ void GLGizmoFlatten::on_render(const GLCanvas3D::Selection& selection) const
const Transform3d& m = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix(); const Transform3d& m = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix();
::glPushMatrix(); ::glPushMatrix();
::glMultMatrixd(m.data()); ::glMultMatrixd(m.data());
::glTranslatef(0.f, 0.f, selection.get_volume(*selection.get_volume_idxs().begin())->get_sla_shift_z());
for (int i = 0; i < (int)m_planes.size(); ++i) for (int i = 0; i < (int)m_planes.size(); ++i)
{ {
if (i == m_hover_id) if (i == m_hover_id)
@ -1497,6 +1498,7 @@ void GLGizmoFlatten::on_render_for_picking(const GLCanvas3D::Selection& selectio
const Transform3d& m = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix(); const Transform3d& m = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix();
::glPushMatrix(); ::glPushMatrix();
::glMultMatrixd(m.data()); ::glMultMatrixd(m.data());
::glTranslatef(0.f, 0.f, selection.get_volume(*selection.get_volume_idxs().begin())->get_sla_shift_z());
for (int i = 0; i < (int)m_planes.size(); ++i) for (int i = 0; i < (int)m_planes.size(); ++i)
{ {
::glColor3f(1.0f, 1.0f, picking_color_component(i)); ::glColor3f(1.0f, 1.0f, picking_color_component(i));