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

Measuring - Refactoring in GLGizmoMeasure related to scene raycasters state cache

Browse source 
Fixed conflicts while rebasing to master
This commit is contained in:
enricoturri1966 2022-09-27 10:21:57 +02:00
parent 10459706b8
commit aee76f0c11
3 changed files with 43 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View file

@ -372,11 +372,13 @@ void GLGizmoMeasure::on_set_state()
else {
m_mode = EMode::BasicSelection;
// store current state of scene raycaster for later use
m_scene_raycaster_state.clear();
m_scene_raycasters = m_parent.get_raycasters_for_picking(SceneRaycaster::EType::Volume);
if (m_scene_raycasters != nullptr) {
for (const auto& r : *m_scene_raycasters) {
m_scene_raycaster_state.emplace_back(r->is_active());
m_scene_raycasters.clear();
auto scene_raycasters = m_parent.get_raycasters_for_picking(SceneRaycaster::EType::Volume);
if (scene_raycasters != nullptr) {
m_scene_raycasters.reserve(scene_raycasters->size());
for (auto r : *scene_raycasters) {
SceneRaycasterState state = { r, r->is_active() };
m_scene_raycasters.emplace_back(state);
}
}
}
@ -772,20 +774,15 @@ void GLGizmoMeasure::update_if_needed()
void GLGizmoMeasure::disable_scene_raycasters()
{
if (m_scene_raycasters != nullptr) {
for (auto r : *m_scene_raycasters) {
r->set_active(false);
}
for (auto r : m_scene_raycasters) {
r.raycaster->set_active(false);
}
}
void GLGizmoMeasure::restore_scene_raycasters_state()
{
if (m_scene_raycasters != nullptr) {
assert(m_scene_raycasters->size() == m_scene_raycaster_state.size());
for (size_t i = 0; i < m_scene_raycasters->size(); ++i) {
(*m_scene_raycasters)[i]->set_active(m_scene_raycaster_state[i]);
}
for (auto r : m_scene_raycasters) {
r.raycaster->set_active(r.state);
}
}