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

Fixed update of the SLAPrint back end after mirroring in a specific

Browse Source 
case of mirroring around the X axis.
Fixed some asserts on visual studio due to access to empty std::vector
This commit is contained in:
bubnikv 2019-04-02 18:04:23 +02:00
parent 66fce6d46c
commit eeae1c0495
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libslic3r/SLAPrint.cpp
View File

@ -94,7 +94,7 @@ static Transform3d sla_trafo(const ModelObject &model_object)
offset(1) = 0.; offset(1) = 0.;
rotation(2) = 0.; rotation(2) = 0.;
Transform3d trafo = Geometry::assemble_transform(offset, rotation, model_instance.get_scaling_factor(), model_instance.get_mirror()); Transform3d trafo = Geometry::assemble_transform(offset, rotation, model_instance.get_scaling_factor(), model_instance.get_mirror());
if (model_instance.is_left_handed()) if (model_instance.is_left_handed())
trafo = Eigen::Scaling(Vec3d(-1., 1., 1.)) * trafo; trafo = Eigen::Scaling(Vec3d(-1., 1., 1.)) * trafo;
return trafo; return trafo;
} }
@ -317,8 +317,11 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, const DynamicPrintConf
it_print_object_status = print_object_status.end(); it_print_object_status = print_object_status.end();
// Check whether a model part volume was added or removed, their transformations or order changed. // Check whether a model part volume was added or removed, their transformations or order changed.
bool model_parts_differ = model_volume_list_changed(model_object, model_object_new, ModelVolumeType::MODEL_PART); bool model_parts_differ = model_volume_list_changed(model_object, model_object_new, ModelVolumeType::MODEL_PART);
bool sla_trafo_differs = model_object.instances.empty() != model_object_new.instances.empty() || bool sla_trafo_differs =
(! model_object.instances.empty() && ! sla_trafo(model_object).isApprox(sla_trafo(model_object_new))); model_object.instances.empty() != model_object_new.instances.empty() ||
(! model_object.instances.empty() &&
(! sla_trafo(model_object).isApprox(sla_trafo(model_object_new)) ||
model_object.instances.front()->is_left_handed() != model_object_new.instances.front()->is_left_handed()));
if (model_parts_differ || sla_trafo_differs) { if (model_parts_differ || sla_trafo_differs) {
// The very first step (the slicing step) is invalidated. One may freely remove all associated PrintObjects. // The very first step (the slicing step) is invalidated. One may freely remove all associated PrintObjects.
if (it_print_object_status != print_object_status.end()) { if (it_print_object_status != print_object_status.end()) {

26
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -5065,17 +5065,25 @@ void GLCanvas3D::_render_sla_slices() const
if (obj->is_left_handed()) if (obj->is_left_handed())
// The polygons are mirrored by X. // The polygons are mirrored by X.
::glScalef(-1.0, 1.0, 1.0); ::glScalef(-1.0, 1.0, 1.0);
::glColor3f(1.0f, 0.37f, 0.0f);
::glEnableClientState(GL_VERTEX_ARRAY); ::glEnableClientState(GL_VERTEX_ARRAY);
::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)bottom_obj_triangles.front().data()); ::glColor3f(1.0f, 0.37f, 0.0f);
::glDrawArrays(GL_TRIANGLES, 0, bottom_obj_triangles.size()); if (!bottom_obj_triangles.empty()) {
::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)top_obj_triangles.front().data()); ::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)bottom_obj_triangles.front().data());
::glDrawArrays(GL_TRIANGLES, 0, top_obj_triangles.size()); ::glDrawArrays(GL_TRIANGLES, 0, bottom_obj_triangles.size());
}
if (! top_obj_triangles.empty()) {
::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)top_obj_triangles.front().data());
::glDrawArrays(GL_TRIANGLES, 0, top_obj_triangles.size());
}
::glColor3f(1.0f, 0.0f, 0.37f); ::glColor3f(1.0f, 0.0f, 0.37f);
::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)bottom_sup_triangles.front().data()); if (! bottom_sup_triangles.empty()) {
::glDrawArrays(GL_TRIANGLES, 0, bottom_sup_triangles.size()); ::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)bottom_sup_triangles.front().data());
::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)top_sup_triangles.front().data()); ::glDrawArrays(GL_TRIANGLES, 0, bottom_sup_triangles.size());
::glDrawArrays(GL_TRIANGLES, 0, top_sup_triangles.size()); }
if (! top_sup_triangles.empty()) {
::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)top_sup_triangles.front().data());
::glDrawArrays(GL_TRIANGLES, 0, top_sup_triangles.size());
}
::glDisableClientState(GL_VERTEX_ARRAY); ::glDisableClientState(GL_VERTEX_ARRAY);
::glPopMatrix(); ::glPopMatrix();
} }