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

Measuring: Measure gizmo - added visualization of point for extended selection and updates to imgui dialog

Browse source
This commit is contained in:
enricoturri1966 2022-08-31 12:42:55 +02:00
parent 2bb16b1dc8
commit 60aaebc1fe
3 changed files with 151 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -5465,8 +5465,13 @@ void GLCanvas3D::_picking_pass()
// 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)) {
m_hover_volume_idxs.emplace_back(hit.raycaster_id);
#if !ENABLE_MEASURE_GIZMO
m_gizmos.set_hover_id(-1);
#endif // !ENABLE_MEASURE_GIZMO
}
#if ENABLE_MEASURE_GIZMO
m_gizmos.set_hover_id(-1);
#endif // ENABLE_MEASURE_GIZMO
}
}
else
@ -5477,8 +5482,8 @@ void GLCanvas3D::_picking_pass()
case SceneRaycaster::EType::Gizmo:
{
const Size& cnv_size = get_canvas_size();
bool inside = 0 <= m_mouse.position.x() && m_mouse.position.x() < cnv_size.get_width() &&
0 <= m_mouse.position.y() && m_mouse.position.y() < cnv_size.get_height();
const bool inside = 0 <= m_mouse.position.x() && m_mouse.position.x() < cnv_size.get_width() &&
0 <= m_mouse.position.y() && m_mouse.position.y() < cnv_size.get_height();
m_gizmos.set_hover_id(inside ? hit.raycaster_id : -1);
break;
}