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

Fixed an issue with the SLA Z offset at the end of slicing,

Browse Source 
fixed compilation on OSX due to the libigl overriding our "L" localization
macro.
This commit is contained in:
bubnikv 2018-11-26 15:19:42 +01:00
parent c72522d566
commit b5c56caf6f
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4091,7 +4091,8 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
if (printer_technology == ptSLA) { if (printer_technology == ptSLA) {
size_t idx = 0; size_t idx = 0;
const SLAPrint *sla_print = this->sla_print(); const SLAPrint *sla_print = this->sla_print();
for (const SLAPrintObject *print_object : sla_print->objects()) { std::vector<double> shift_zs(m_model->objects.size(), 0);
for (const SLAPrintObject *print_object : sla_print->objects()) {
SLASupportState &state = sla_support_state[idx ++]; SLASupportState &state = sla_support_state[idx ++];
const ModelObject *model_object = print_object->model_object(); const ModelObject *model_object = print_object->model_object();
// Find an index of the ModelObject // Find an index of the ModelObject
@ -4103,6 +4104,8 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
auto it = std::find(sla_print->model().objects.begin(), sla_print->model().objects.end(), model_object); auto it = std::find(sla_print->model().objects.begin(), sla_print->model().objects.end(), model_object);
assert(it != sla_print->model().objects.end()); assert(it != sla_print->model().objects.end());
object_idx = it - sla_print->model().objects.begin(); object_idx = it - sla_print->model().objects.begin();
// Cache the Z offset to be applied to all volumes with this object_idx.
shift_zs[object_idx] = print_object->get_current_elevation();
// Collect indices of this print_object's instances, for which the SLA support meshes are to be added to the scene. // Collect indices of this print_object's instances, for which the SLA support meshes are to be added to the scene.
// pairs of <instance_idx, print_instance_idx> // pairs of <instance_idx, print_instance_idx>
std::vector<std::pair<size_t, size_t>> instances[std::tuple_size<SLASteps>::value]; std::vector<std::pair<size_t, size_t>> instances[std::tuple_size<SLASteps>::value];
@ -4132,19 +4135,11 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
for (size_t istep = 0; istep < sla_steps.size(); ++istep) for (size_t istep = 0; istep < sla_steps.size(); ++istep)
if (!instances[istep].empty()) if (!instances[istep].empty())
m_volumes.load_object_auxiliary(print_object, object_idx, instances[istep], sla_steps[istep], state.step[istep].timestamp, m_use_VBOs && m_initialized); m_volumes.load_object_auxiliary(print_object, object_idx, instances[istep], sla_steps[istep], state.step[istep].timestamp, m_use_VBOs && m_initialized);
if (volumes_count != m_volumes.volumes.size())
{
// If any volume has been added
// Shift-up all volumes of the object so that it has the right elevation with respect to the print bed
double shift_z = print_object->get_current_elevation();
for (GLVolume* volume : m_volumes.volumes)
{
if (volume->object_idx() == object_idx)
volume->set_sla_shift_z(shift_z);
}
}
} }
// Shift-up all volumes of the object so that it has the right elevation with respect to the print bed
for (GLVolume* volume : m_volumes.volumes)
volume->set_sla_shift_z(shift_zs[volume->object_idx()]);
} }
if (printer_technology == ptFFF && m_config->has("nozzle_diameter")) if (printer_technology == ptFFF && m_config->has("nozzle_diameter"))

5
src/slic3r/GUI/GLGizmo.cpp
View File

@ -1,4 +1,6 @@
// #include <igl/unproject_onto_mesh.h> // Include GLGizmo.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
#include "GLGizmo.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include <Eigen/Dense> #include <Eigen/Dense>
@ -22,7 +24,6 @@
#include "GUI_Utils.hpp" #include "GUI_Utils.hpp"
#include "GUI_App.hpp" #include "GUI_App.hpp"
#include "I18N.hpp" #include "I18N.hpp"
#include "GLGizmo.hpp"
#include "PresetBundle.hpp" #include "PresetBundle.hpp"
#if ENABLE_GIZMOS_SHORTCUT #if ENABLE_GIZMOS_SHORTCUT