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

Removed mutable members from class GLCanvas3D

Browse Source
This commit is contained in:
enricoturri1966 2021-04-20 12:16:55 +02:00
parent b0bb1e7b1d
commit 0e3090fb28
2 changed files with 98 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3528,7 +3528,7 @@ Vec2d GLCanvas3D::get_local_mouse_position() const
void GLCanvas3D::set_tooltip(const std::string& tooltip) const void GLCanvas3D::set_tooltip(const std::string& tooltip) const
{ {
if (m_canvas != nullptr) if (m_canvas != nullptr)
m_tooltip.set_text(tooltip); const_cast<Tooltip*>(&m_tooltip)->set_text(tooltip);
} }
void GLCanvas3D::do_move(const std::string& snapshot_type) void GLCanvas3D::do_move(const std::string& snapshot_type)
@ -3545,22 +3545,19 @@ void GLCanvas3D::do_move(const std::string& snapshot_type)
Selection::EMode selection_mode = m_selection.get_mode(); Selection::EMode selection_mode = m_selection.get_mode();
for (const GLVolume* v : m_volumes.volumes) for (const GLVolume* v : m_volumes.volumes) {
{
int object_idx = v->object_idx(); int object_idx = v->object_idx();
int instance_idx = v->instance_idx(); int instance_idx = v->instance_idx();
int volume_idx = v->volume_idx(); int volume_idx = v->volume_idx();
std::pair<int, int> done_id(object_idx, instance_idx); std::pair<int, int> done_id(object_idx, instance_idx);
if ((0 <= object_idx) && (object_idx < (int)m_model->objects.size())) if (0 <= object_idx && object_idx < (int)m_model->objects.size()) {
{
done.insert(done_id); done.insert(done_id);
// Move instances/volumes // Move instances/volumes
ModelObject* model_object = m_model->objects[object_idx]; ModelObject* model_object = m_model->objects[object_idx];
if (model_object != nullptr) if (model_object != nullptr) {
{
if (selection_mode == Selection::Instance) if (selection_mode == Selection::Instance)
model_object->instances[instance_idx]->set_offset(v->get_instance_offset()); model_object->instances[instance_idx]->set_offset(v->get_instance_offset());
else if (selection_mode == Selection::Volume) else if (selection_mode == Selection::Volume)
@ -3576,8 +3573,7 @@ void GLCanvas3D::do_move(const std::string& snapshot_type)
} }
// Fixes sinking/flying instances // Fixes sinking/flying instances
for (const std::pair<int, int>& i : done) for (const std::pair<int, int>& i : done) {
{
ModelObject* m = m_model->objects[i.first]; ModelObject* m = m_model->objects[i.first];
Vec3d shift(0.0, 0.0, -m->get_instance_min_z(i.second)); Vec3d shift(0.0, 0.0, -m->get_instance_min_z(i.second));
m_selection.translate(i.first, i.second, shift); m_selection.translate(i.first, i.second, shift);
@ -3936,13 +3932,13 @@ bool GLCanvas3D::_render_undo_redo_stack(const bool is_undo, float pos_x) const
em *= m_retina_helper->get_scale_factor(); em *= m_retina_helper->get_scale_factor();
#endif #endif
if (imgui->undo_redo_list(ImVec2(18 * em, 26 * em), is_undo, &string_getter, hovered, selected, m_mouse_wheel)) int* mouse_wheel = const_cast<int*>(&m_mouse_wheel);
m_imgui_undo_redo_hovered_pos = hovered; if (imgui->undo_redo_list(ImVec2(18 * em, 26 * em), is_undo, &string_getter, hovered, selected, *mouse_wheel))
*const_cast<int*>(&m_imgui_undo_redo_hovered_pos) = hovered;
else else
m_imgui_undo_redo_hovered_pos = -1; *const_cast<int*>(&m_imgui_undo_redo_hovered_pos) = -1;
if (selected >= 0) if (selected >= 0) {
{
is_undo ? wxGetApp().plater()->undo_to(selected) : wxGetApp().plater()->redo_to(selected); is_undo ? wxGetApp().plater()->undo_to(selected) : wxGetApp().plater()->redo_to(selected);
action_taken = true; action_taken = true;
} }
@ -3983,9 +3979,10 @@ bool GLCanvas3D::_render_search_list(float pos_x) const
char *s = new char[255]; char *s = new char[255];
strcpy(s, search_line.empty() ? _u8L("Enter a search term").c_str() : search_line.c_str()); strcpy(s, search_line.empty() ? _u8L("Enter a search term").c_str() : search_line.c_str());
int* mouse_wheel = const_cast<int*>(&m_mouse_wheel);
imgui->search_list(ImVec2(45 * em, 30 * em), &search_string_getter, s, imgui->search_list(ImVec2(45 * em, 30 * em), &search_string_getter, s,
sidebar.get_searcher().view_params, sidebar.get_searcher().view_params,
selected, edited, m_mouse_wheel, wxGetApp().is_localized()); selected, edited, *mouse_wheel, wxGetApp().is_localized());
search_line = s; search_line = s;
delete [] s; delete [] s;
@ -4844,8 +4841,10 @@ void GLCanvas3D::_refresh_if_shown_on_screen()
void GLCanvas3D::_picking_pass() const void GLCanvas3D::_picking_pass() const
{ {
std::vector<int>* hover_volume_idxs = const_cast<std::vector<int>*>(&m_hover_volume_idxs);
if (m_picking_enabled && !m_mouse.dragging && m_mouse.position != Vec2d(DBL_MAX, DBL_MAX)) { if (m_picking_enabled && !m_mouse.dragging && m_mouse.position != Vec2d(DBL_MAX, DBL_MAX)) {
m_hover_volume_idxs.clear(); hover_volume_idxs->clear();
// Render the object for picking. // Render the object for picking.
// FIXME This cannot possibly work in a multi - sampled context as the color gets mangled by the anti - aliasing. // FIXME This cannot possibly work in a multi - sampled context as the color gets mangled by the anti - aliasing.
@ -4860,9 +4859,10 @@ void GLCanvas3D::_picking_pass() const
glsafe(::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)); glsafe(::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
m_camera_clipping_plane = m_gizmos.get_clipping_plane(); ClippingPlane* camera_clipping_plane = const_cast<ClippingPlane*>(&m_camera_clipping_plane);
if (m_camera_clipping_plane.is_active()) { *camera_clipping_plane = m_gizmos.get_clipping_plane();
::glClipPlane(GL_CLIP_PLANE0, (GLdouble*)m_camera_clipping_plane.get_data()); if (camera_clipping_plane->is_active()) {
::glClipPlane(GL_CLIP_PLANE0, (GLdouble*)camera_clipping_plane->get_data());
::glEnable(GL_CLIP_PLANE0); ::glEnable(GL_CLIP_PLANE0);
} }
_render_volumes_for_picking(); _render_volumes_for_picking();
@ -4888,11 +4888,11 @@ void GLCanvas3D::_picking_pass() const
if (0 <= volume_id && volume_id < (int)m_volumes.volumes.size()) { if (0 <= volume_id && volume_id < (int)m_volumes.volumes.size()) {
// do not add the volume id if any gizmo is active and CTRL is pressed // do not add the volume id if any gizmo is active and CTRL is pressed
if (m_gizmos.get_current_type() == GLGizmosManager::EType::Undefined || !wxGetKeyState(WXK_CONTROL)) if (m_gizmos.get_current_type() == GLGizmosManager::EType::Undefined || !wxGetKeyState(WXK_CONTROL))
m_hover_volume_idxs.emplace_back(volume_id); hover_volume_idxs->emplace_back(volume_id);
m_gizmos.set_hover_id(-1); const_cast<GLGizmosManager*>(&m_gizmos)->set_hover_id(-1);
} }
else else
m_gizmos.set_hover_id(inside && (unsigned int)volume_id <= GLGizmoBase::BASE_ID ? ((int)GLGizmoBase::BASE_ID - volume_id) : -1); const_cast<GLGizmosManager*>(&m_gizmos)->set_hover_id(inside && (unsigned int)volume_id <= GLGizmoBase::BASE_ID ? ((int)GLGizmoBase::BASE_ID - volume_id) : -1);
_update_volumes_hover_state(); _update_volumes_hover_state();
} }
@ -4900,12 +4900,11 @@ void GLCanvas3D::_picking_pass() const
void GLCanvas3D::_rectangular_selection_picking_pass() const void GLCanvas3D::_rectangular_selection_picking_pass() const
{ {
m_gizmos.set_hover_id(-1); const_cast<GLGizmosManager*>(&m_gizmos)->set_hover_id(-1);
std::set<int> idxs; std::set<int> idxs;
if (m_picking_enabled) if (m_picking_enabled) {
{
if (m_multisample_allowed) if (m_multisample_allowed)
// This flag is often ignored by NVIDIA drivers if rendering into a screen buffer. // This flag is often ignored by NVIDIA drivers if rendering into a screen buffer.
glsafe(::glDisable(GL_MULTISAMPLE)); glsafe(::glDisable(GL_MULTISAMPLE));
@ -4926,8 +4925,7 @@ void GLCanvas3D::_rectangular_selection_picking_pass() const
int left = (int)m_rectangle_selection.get_left(); int left = (int)m_rectangle_selection.get_left();
int top = get_canvas_size().get_height() - (int)m_rectangle_selection.get_top(); int top = get_canvas_size().get_height() - (int)m_rectangle_selection.get_top();
if ((left >= 0) && (top >= 0)) if (left >= 0 && top >= 0) {
{
#define USE_PARALLEL 1 #define USE_PARALLEL 1
#if USE_PARALLEL #if USE_PARALLEL
struct Pixel struct Pixel
@ -4947,7 +4945,7 @@ void GLCanvas3D::_rectangular_selection_picking_pass() const
for (size_t i = range.begin(); i < range.end(); ++i) for (size_t i = range.begin(); i < range.end(); ++i)
if (frame[i].valid()) { if (frame[i].valid()) {
int volume_id = frame[i].id(); int volume_id = frame[i].id();
if ((0 <= volume_id) && (volume_id < (int)m_volumes.volumes.size())) { if (0 <= volume_id && volume_id < (int)m_volumes.volumes.size()) {
mutex.lock(); mutex.lock();
idxs.insert(volume_id); idxs.insert(volume_id);
mutex.unlock(); mutex.unlock();
@ -4962,14 +4960,14 @@ void GLCanvas3D::_rectangular_selection_picking_pass() const
{ {
int px_id = 4 * i; int px_id = 4 * i;
int volume_id = frame[px_id] + (frame[px_id + 1] << 8) + (frame[px_id + 2] << 16); int volume_id = frame[px_id] + (frame[px_id + 1] << 8) + (frame[px_id + 2] << 16);
if ((0 <= volume_id) && (volume_id < (int)m_volumes.volumes.size())) if (0 <= volume_id && volume_id < (int)m_volumes.volumes.size())
idxs.insert(volume_id); idxs.insert(volume_id);
} }
#endif // USE_PARALLEL #endif // USE_PARALLEL
} }
} }
m_hover_volume_idxs.assign(idxs.begin(), idxs.end()); const_cast<std::vector<int>*>(&m_hover_volume_idxs)->assign(idxs.begin(), idxs.end());
_update_volumes_hover_state(); _update_volumes_hover_state();
} }
@ -5062,7 +5060,9 @@ void GLCanvas3D::_render_objects() const
glsafe(::glEnable(GL_DEPTH_TEST)); glsafe(::glEnable(GL_DEPTH_TEST));
m_camera_clipping_plane = m_gizmos.get_clipping_plane(); ClippingPlane* camera_clipping_plane = const_cast<ClippingPlane*>(&m_camera_clipping_plane);
GLVolumeCollection* volumes = const_cast<GLVolumeCollection*>(&m_volumes);
*camera_clipping_plane = m_gizmos.get_clipping_plane();
if (m_picking_enabled) { if (m_picking_enabled) {
// Update the layer editing selection to the first object selected, update the current object maximum Z. // Update the layer editing selection to the first object selected, update the current object maximum Z.
@ -5070,17 +5070,17 @@ void GLCanvas3D::_render_objects() const
if (m_config != nullptr) { if (m_config != nullptr) {
const BoundingBoxf3& bed_bb = wxGetApp().plater()->get_bed().get_bounding_box(false); const BoundingBoxf3& bed_bb = wxGetApp().plater()->get_bed().get_bounding_box(false);
m_volumes.set_print_box((float)bed_bb.min(0) - BedEpsilon, (float)bed_bb.min(1) - BedEpsilon, 0.0f, (float)bed_bb.max(0) + BedEpsilon, (float)bed_bb.max(1) + BedEpsilon, (float)m_config->opt_float("max_print_height")); volumes->set_print_box((float)bed_bb.min(0) - BedEpsilon, (float)bed_bb.min(1) - BedEpsilon, 0.0f, (float)bed_bb.max(0) + BedEpsilon, (float)bed_bb.max(1) + BedEpsilon, (float)m_config->opt_float("max_print_height"));
m_volumes.check_outside_state(m_config, nullptr); volumes->check_outside_state(m_config, nullptr);
} }
} }
if (m_use_clipping_planes) if (m_use_clipping_planes)
m_volumes.set_z_range(-m_clipping_planes[0].get_data()[3], m_clipping_planes[1].get_data()[3]); volumes->set_z_range(-m_clipping_planes[0].get_data()[3], m_clipping_planes[1].get_data()[3]);
else else
m_volumes.set_z_range(-FLT_MAX, FLT_MAX); volumes->set_z_range(-FLT_MAX, FLT_MAX);
m_volumes.set_clipping_plane(m_camera_clipping_plane.get_data()); volumes->set_clipping_plane(camera_clipping_plane->get_data());
GLShaderProgram* shader = wxGetApp().get_shader("gouraud"); GLShaderProgram* shader = wxGetApp().get_shader("gouraud");
if (shader != nullptr) { if (shader != nullptr) {
@ -5088,15 +5088,15 @@ void GLCanvas3D::_render_objects() const
if (m_picking_enabled && !m_gizmos.is_dragging() && m_layers_editing.is_enabled() && (m_layers_editing.last_object_id != -1) && (m_layers_editing.object_max_z() > 0.0f)) { if (m_picking_enabled && !m_gizmos.is_dragging() && m_layers_editing.is_enabled() && (m_layers_editing.last_object_id != -1) && (m_layers_editing.object_max_z() > 0.0f)) {
int object_id = m_layers_editing.last_object_id; int object_id = m_layers_editing.last_object_id;
m_volumes.render(GLVolumeCollection::Opaque, false, wxGetApp().plater()->get_camera().get_view_matrix(), [object_id](const GLVolume& volume) { volumes->render(GLVolumeCollection::Opaque, false, wxGetApp().plater()->get_camera().get_view_matrix(), [object_id](const GLVolume& volume) {
// Which volume to paint without the layer height profile shader? // Which volume to paint without the layer height profile shader?
return volume.is_active && (volume.is_modifier || volume.composite_id.object_id != object_id); return volume.is_active && (volume.is_modifier || volume.composite_id.object_id != object_id);
}); });
// Let LayersEditing handle rendering of the active object using the layer height profile shader. // Let LayersEditing handle rendering of the active object using the layer height profile shader.
m_layers_editing.render_volumes(*this, this->m_volumes); m_layers_editing.render_volumes(*this, *volumes);
} else { } else {
// do not cull backfaces to show broken geometry, if any // do not cull backfaces to show broken geometry, if any
m_volumes.render(GLVolumeCollection::Opaque, m_picking_enabled, wxGetApp().plater()->get_camera().get_view_matrix(), [this](const GLVolume& volume) { volumes->render(GLVolumeCollection::Opaque, m_picking_enabled, wxGetApp().plater()->get_camera().get_view_matrix(), [this](const GLVolume& volume) {
return (m_render_sla_auxiliaries || volume.composite_id.volume_id >= 0); return (m_render_sla_auxiliaries || volume.composite_id.volume_id >= 0);
}); });
} }
@ -5115,11 +5115,11 @@ void GLCanvas3D::_render_objects() const
} }
} }
m_volumes.render(GLVolumeCollection::Transparent, false, wxGetApp().plater()->get_camera().get_view_matrix()); volumes->render(GLVolumeCollection::Transparent, false, wxGetApp().plater()->get_camera().get_view_matrix());
shader->stop_using(); shader->stop_using();
} }
m_camera_clipping_plane = ClippingPlane::ClipsNothing(); *camera_clipping_plane = ClippingPlane::ClipsNothing();
} }
void GLCanvas3D::_render_gcode() const void GLCanvas3D::_render_gcode() const
@ -5160,13 +5160,13 @@ void GLCanvas3D::_check_and_update_toolbar_icon_scale() const
GLToolbar& collapse_toolbar = wxGetApp().plater()->get_collapse_toolbar(); GLToolbar& collapse_toolbar = wxGetApp().plater()->get_collapse_toolbar();
#if ENABLE_RETINA_GL #if ENABLE_RETINA_GL
const float sc = m_retina_helper->get_scale_factor() * scale; const float sc = m_retina_helper->get_scale_factor() * scale;
m_main_toolbar.set_scale(sc); const_cast<GLToolbar*>(&m_main_toolbar)->set_scale(sc);
m_undoredo_toolbar.set_scale(sc); const_cast<GLToolbar*>(&m_undoredo_toolbar)->set_scale(sc);
collapse_toolbar.set_scale(sc); collapse_toolbar.set_scale(sc);
size *= m_retina_helper->get_scale_factor(); size *= m_retina_helper->get_scale_factor();
#else #else
m_main_toolbar.set_icons_size(size); const_cast<GLToolbar*>(&m_main_toolbar)->set_icons_size(size);
m_undoredo_toolbar.set_icons_size(size); const_cast<GLToolbar*>(&m_undoredo_toolbar)->set_icons_size(size);
collapse_toolbar.set_icons_size(size); collapse_toolbar.set_icons_size(size);
#endif // ENABLE_RETINA_GL #endif // ENABLE_RETINA_GL
@ -5214,13 +5214,13 @@ void GLCanvas3D::_render_overlays() const
// to correctly place them // to correctly place them
#if ENABLE_RETINA_GL #if ENABLE_RETINA_GL
const float scale = m_retina_helper->get_scale_factor() * wxGetApp().toolbar_icon_scale(/*true*/); const float scale = m_retina_helper->get_scale_factor() * wxGetApp().toolbar_icon_scale(/*true*/);
m_main_toolbar.set_scale(scale); const_cast<GLToolbar*>(&m_main_toolbar)->set_scale(scale);
m_undoredo_toolbar.set_scale(scale); const_cast<GLToolbar*>(&m_undoredo_toolbar)->set_scale(scale);
wxGetApp().plater()->get_collapse_toolbar().set_scale(scale); wxGetApp().plater()->get_collapse_toolbar().set_scale(scale);
#else #else
const float size = int(GLToolbar::Default_Icons_Size * wxGetApp().toolbar_icon_scale(/*true*/)); const float size = int(GLToolbar::Default_Icons_Size * wxGetApp().toolbar_icon_scale(/*true*/));
m_main_toolbar.set_icons_size(size); const_cast<GLToolbar*>(&m_main_toolbar)->set_icons_size(size);
m_undoredo_toolbar.set_icons_size(size); const_cast<GLToolbar*>(&m_undoredo_toolbar)->set_icons_size(size);
wxGetApp().plater()->get_collapse_toolbar().set_icons_size(size); wxGetApp().plater()->get_collapse_toolbar().set_icons_size(size);
#endif // ENABLE_RETINA_GL #endif // ENABLE_RETINA_GL
@ -5295,12 +5295,12 @@ void GLCanvas3D::_render_gizmos_overlay() const
#if ENABLE_RETINA_GL #if ENABLE_RETINA_GL
// m_gizmos.set_overlay_scale(m_retina_helper->get_scale_factor()); // m_gizmos.set_overlay_scale(m_retina_helper->get_scale_factor());
const float scale = m_retina_helper->get_scale_factor()*wxGetApp().toolbar_icon_scale(); const float scale = m_retina_helper->get_scale_factor()*wxGetApp().toolbar_icon_scale();
m_gizmos.set_overlay_scale(scale); //! #ys_FIXME_experiment const_cast<GLGizmosManager*>(&m_gizmos)->set_overlay_scale(scale); //! #ys_FIXME_experiment
#else #else
// m_gizmos.set_overlay_scale(m_canvas->GetContentScaleFactor()); // m_gizmos.set_overlay_scale(m_canvas->GetContentScaleFactor());
// m_gizmos.set_overlay_scale(wxGetApp().em_unit()*0.1f); // m_gizmos.set_overlay_scale(wxGetApp().em_unit()*0.1f);
const float size = int(GLGizmosManager::Default_Icons_Size*wxGetApp().toolbar_icon_scale()); const float size = int(GLGizmosManager::Default_Icons_Size * wxGetApp().toolbar_icon_scale());
m_gizmos.set_overlay_icon_size(size); //! #ys_FIXME_experiment const_cast<GLGizmosManager*>(&m_gizmos)->set_overlay_icon_size(size); //! #ys_FIXME_experiment
#endif /* __WXMSW__ */ #endif /* __WXMSW__ */
m_gizmos.render_overlay(); m_gizmos.render_overlay();
@ -5319,8 +5319,9 @@ void GLCanvas3D::_render_main_toolbar() const
float collapse_toolbar_width = collapse_toolbar.is_enabled() ? collapse_toolbar.get_width() : 0.0f; float collapse_toolbar_width = collapse_toolbar.is_enabled() ? collapse_toolbar.get_width() : 0.0f;
float left = -0.5f * (m_main_toolbar.get_width() + m_undoredo_toolbar.get_width() + collapse_toolbar_width) * inv_zoom; float left = -0.5f * (m_main_toolbar.get_width() + m_undoredo_toolbar.get_width() + collapse_toolbar_width) * inv_zoom;
m_main_toolbar.set_position(top, left); GLToolbar* main_toolbar = const_cast<GLToolbar*>(&m_main_toolbar);
m_main_toolbar.render(*this); main_toolbar->set_position(top, left);
main_toolbar->render(*this);
} }
void GLCanvas3D::_render_undoredo_toolbar() const void GLCanvas3D::_render_undoredo_toolbar() const
@ -5335,8 +5336,10 @@ void GLCanvas3D::_render_undoredo_toolbar() const
const GLToolbar& collapse_toolbar = wxGetApp().plater()->get_collapse_toolbar(); const GLToolbar& collapse_toolbar = wxGetApp().plater()->get_collapse_toolbar();
float collapse_toolbar_width = collapse_toolbar.is_enabled() ? collapse_toolbar.get_width() : 0.0f; float collapse_toolbar_width = collapse_toolbar.is_enabled() ? collapse_toolbar.get_width() : 0.0f;
float left = (m_main_toolbar.get_width() - 0.5f * (m_main_toolbar.get_width() + m_undoredo_toolbar.get_width() + collapse_toolbar_width)) * inv_zoom; float left = (m_main_toolbar.get_width() - 0.5f * (m_main_toolbar.get_width() + m_undoredo_toolbar.get_width() + collapse_toolbar_width)) * inv_zoom;
m_undoredo_toolbar.set_position(top, left);
m_undoredo_toolbar.render(*this); GLToolbar* undoredo_toolbar = const_cast<GLToolbar*>(&m_undoredo_toolbar);
undoredo_toolbar->set_position(top, left);
undoredo_toolbar->render(*this);
} }
void GLCanvas3D::_render_collapse_toolbar() const void GLCanvas3D::_render_collapse_toolbar() const
@ -5427,20 +5430,21 @@ void GLCanvas3D::_render_sla_slices() const
if (!obj->is_step_done(slaposSliceSupports)) if (!obj->is_step_done(slaposSliceSupports))
continue; continue;
SlaCap::ObjectIdToTrianglesMap::iterator it_caps_bottom = m_sla_caps[0].triangles.find(i); SlaCap* sla_caps = const_cast<SlaCap*>(m_sla_caps);
SlaCap::ObjectIdToTrianglesMap::iterator it_caps_top = m_sla_caps[1].triangles.find(i); SlaCap::ObjectIdToTrianglesMap::iterator it_caps_bottom = sla_caps[0].triangles.find(i);
SlaCap::ObjectIdToTrianglesMap::iterator it_caps_top = sla_caps[1].triangles.find(i);
{ {
if (it_caps_bottom == m_sla_caps[0].triangles.end()) if (it_caps_bottom == sla_caps[0].triangles.end())
it_caps_bottom = m_sla_caps[0].triangles.emplace(i, SlaCap::Triangles()).first; it_caps_bottom = sla_caps[0].triangles.emplace(i, SlaCap::Triangles()).first;
if (! m_sla_caps[0].matches(clip_min_z)) { if (!sla_caps[0].matches(clip_min_z)) {
m_sla_caps[0].z = clip_min_z; sla_caps[0].z = clip_min_z;
it_caps_bottom->second.object.clear(); it_caps_bottom->second.object.clear();
it_caps_bottom->second.supports.clear(); it_caps_bottom->second.supports.clear();
} }
if (it_caps_top == m_sla_caps[1].triangles.end()) if (it_caps_top == sla_caps[1].triangles.end())
it_caps_top = m_sla_caps[1].triangles.emplace(i, SlaCap::Triangles()).first; it_caps_top = sla_caps[1].triangles.emplace(i, SlaCap::Triangles()).first;
if (! m_sla_caps[1].matches(clip_max_z)) { if (!sla_caps[1].matches(clip_max_z)) {
m_sla_caps[1].z = clip_max_z; sla_caps[1].z = clip_max_z;
it_caps_top->second.object.clear(); it_caps_top->second.object.clear();
it_caps_top->second.supports.clear(); it_caps_top->second.supports.clear();
} }
@ -5546,7 +5550,7 @@ void GLCanvas3D::_update_volumes_hover_state() const
if (alt_pressed && (shift_pressed || ctrl_pressed)) { if (alt_pressed && (shift_pressed || ctrl_pressed)) {
// illegal combinations of keys // illegal combinations of keys
m_hover_volume_idxs.clear(); const_cast<std::vector<int>*>(&m_hover_volume_idxs)->clear();
return; return;
} }
@ -5570,7 +5574,7 @@ void GLCanvas3D::_update_volumes_hover_state() const
if (hover_modifiers_only && !hover_from_single_instance) { if (hover_modifiers_only && !hover_from_single_instance) {
// do not allow to select volumes from different instances // do not allow to select volumes from different instances
m_hover_volume_idxs.clear(); const_cast<std::vector<int>*>(&m_hover_volume_idxs)->clear();
return; return;
} }
@ -5591,23 +5595,15 @@ void GLCanvas3D::_update_volumes_hover_state() const
(deselect && !m_selection.is_single_full_instance() && (volume.object_idx() == m_selection.get_object_idx()) && (volume.instance_idx() == m_selection.get_instance_idx())) (deselect && !m_selection.is_single_full_instance() && (volume.object_idx() == m_selection.get_object_idx()) && (volume.instance_idx() == m_selection.get_instance_idx()))
); );
if (as_volume) { if (as_volume)
if (deselect) volume.hover = deselect ? GLVolume::HS_Deselect : GLVolume::HS_Select;
volume.hover = GLVolume::HS_Deselect;
else
volume.hover = GLVolume::HS_Select;
}
else { else {
int object_idx = volume.object_idx(); int object_idx = volume.object_idx();
int instance_idx = volume.instance_idx(); int instance_idx = volume.instance_idx();
for (GLVolume* v : m_volumes.volumes) { for (GLVolume* v : m_volumes.volumes) {
if (v->object_idx() == object_idx && v->instance_idx() == instance_idx) { if (v->object_idx() == object_idx && v->instance_idx() == instance_idx)
if (deselect) v->hover = deselect ? GLVolume::HS_Deselect : GLVolume::HS_Select;
v->hover = GLVolume::HS_Deselect;
else
v->hover = GLVolume::HS_Select;
}
} }
} }
} }

38
src/slic3r/GUI/GLCanvas3D.hpp
View File

@ -449,13 +449,13 @@ private:
wxTimer m_timer; wxTimer m_timer;
LayersEditing m_layers_editing; LayersEditing m_layers_editing;
Mouse m_mouse; Mouse m_mouse;
mutable GLGizmosManager m_gizmos; GLGizmosManager m_gizmos;
mutable GLToolbar m_main_toolbar; GLToolbar m_main_toolbar;
mutable GLToolbar m_undoredo_toolbar; GLToolbar m_undoredo_toolbar;
ClippingPlane m_clipping_planes[2]; ClippingPlane m_clipping_planes[2];
mutable ClippingPlane m_camera_clipping_plane; ClippingPlane m_camera_clipping_plane;
bool m_use_clipping_planes; bool m_use_clipping_planes;
mutable SlaCap m_sla_caps[2]; SlaCap m_sla_caps[2];
std::string m_sidebar_field; std::string m_sidebar_field;
// when true renders an extra frame by not resetting m_dirty to false // when true renders an extra frame by not resetting m_dirty to false
// see request_extra_frame() // see request_extra_frame()
@ -463,7 +463,7 @@ private:
int m_extra_frame_requested_delayed { std::numeric_limits<int>::max() }; int m_extra_frame_requested_delayed { std::numeric_limits<int>::max() };
bool m_event_handlers_bound{ false }; bool m_event_handlers_bound{ false };
mutable GLVolumeCollection m_volumes; GLVolumeCollection m_volumes;
GCodeViewer m_gcode_viewer; GCodeViewer m_gcode_viewer;
RenderTimer m_render_timer; RenderTimer m_render_timer;
@ -478,7 +478,6 @@ private:
bool m_dirty; bool m_dirty;
bool m_initialized; bool m_initialized;
bool m_apply_zoom_to_volumes_filter; bool m_apply_zoom_to_volumes_filter;
mutable std::vector<int> m_hover_volume_idxs;
bool m_picking_enabled; bool m_picking_enabled;
bool m_moving_enabled; bool m_moving_enabled;
bool m_dynamic_background_enabled; bool m_dynamic_background_enabled;
@ -487,6 +486,7 @@ private:
bool m_tab_down; bool m_tab_down;
ECursorType m_cursor_type; ECursorType m_cursor_type;
GLSelectionRectangle m_rectangle_selection; GLSelectionRectangle m_rectangle_selection;
std::vector<int> m_hover_volume_idxs;
// Following variable is obsolete and it should be safe to remove it. // Following variable is obsolete and it should be safe to remove it.
// I just don't want to do it now before a release (Lukas Matena 24.3.2019) // I just don't want to do it now before a release (Lukas Matena 24.3.2019)
@ -504,13 +504,13 @@ private:
RenderStats m_render_stats; RenderStats m_render_stats;
#endif // ENABLE_RENDER_STATISTICS #endif // ENABLE_RENDER_STATISTICS
mutable int m_imgui_undo_redo_hovered_pos{ -1 }; int m_imgui_undo_redo_hovered_pos{ -1 };
mutable int m_mouse_wheel {0}; int m_mouse_wheel{ 0 };
int m_selected_extruder; int m_selected_extruder;
Labels m_labels; Labels m_labels;
mutable Tooltip m_tooltip; Tooltip m_tooltip;
mutable bool m_tooltip_enabled{ true }; bool m_tooltip_enabled{ true };
Slope m_slope; Slope m_slope;
ArrangeSettings m_arrange_settings_fff, m_arrange_settings_sla, ArrangeSettings m_arrange_settings_fff, m_arrange_settings_sla,
@ -519,8 +519,7 @@ private:
PrinterTechnology current_printer_technology() const; PrinterTechnology current_printer_technology() const;
template<class Self> template<class Self>
static auto & get_arrange_settings(Self *self) static auto & get_arrange_settings(Self *self) {
{
PrinterTechnology ptech = self->current_printer_technology(); PrinterTechnology ptech = self->current_printer_technology();
auto *ptr = &self->m_arrange_settings_fff; auto *ptr = &self->m_arrange_settings_fff;
@ -529,12 +528,11 @@ private:
ptr = &self->m_arrange_settings_sla; ptr = &self->m_arrange_settings_sla;
} else if (ptech == ptFFF) { } else if (ptech == ptFFF) {
auto co_opt = self->m_config->template option<ConfigOptionBool>("complete_objects"); auto co_opt = self->m_config->template option<ConfigOptionBool>("complete_objects");
if (co_opt && co_opt->value) { if (co_opt && co_opt->value)
ptr = &self->m_arrange_settings_fff_seq_print; ptr = &self->m_arrange_settings_fff_seq_print;
} else { else
ptr = &self->m_arrange_settings_fff; ptr = &self->m_arrange_settings_fff;
} }
}
return *ptr; return *ptr;
} }
@ -715,10 +713,9 @@ public:
double m_rotation = 0.; double m_rotation = 0.;
BoundingBoxf m_bb; BoundingBoxf m_bb;
friend class GLCanvas3D; friend class GLCanvas3D;
public:
inline operator bool() const public:
{ inline operator bool() const {
return !std::isnan(m_pos.x()) && !std::isnan(m_pos.y()); return !std::isnan(m_pos.x()) && !std::isnan(m_pos.y());
} }
@ -763,8 +760,7 @@ public:
void use_slope(bool use) { m_slope.use(use); } void use_slope(bool use) { m_slope.use(use); }
void set_slope_normal_angle(float angle_in_deg) { m_slope.set_normal_angle(angle_in_deg); } void set_slope_normal_angle(float angle_in_deg) { m_slope.set_normal_angle(angle_in_deg); }
ArrangeSettings get_arrange_settings() const ArrangeSettings get_arrange_settings() const {
{
const ArrangeSettings &settings = get_arrange_settings(this); const ArrangeSettings &settings = get_arrange_settings(this);
ArrangeSettings ret = settings; ArrangeSettings ret = settings;
if (&settings == &m_arrange_settings_fff_seq_print) { if (&settings == &m_arrange_settings_fff_seq_print) {