3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-20 13:17:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Small refactoring in GLCanvas3D

Browse source
This commit is contained in:
enricoturri1966 2021-05-17 13:14:19 +02:00
parent 858ea16b95
commit 40086784fe
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2949,6 +2949,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
m_mouse.set_start_position_3D_as_invalid(); m_mouse.set_start_position_3D_as_invalid();
m_mouse.position = pos.cast<double>(); m_mouse.position = pos.cast<double>();
return; return;
} }
@ -3147,7 +3148,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
// See GH issue #3816. // See GH issue #3816.
Camera& camera = wxGetApp().plater()->get_camera(); Camera& camera = wxGetApp().plater()->get_camera();
camera.recover_from_free_camera(); camera.recover_from_free_camera();
camera.rotate_on_sphere(rot.x(), rot.y(), wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() != ptSLA); camera.rotate_on_sphere(rot.x(), rot.y(), current_printer_technology() != ptSLA);
} }
m_dirty = true; m_dirty = true;
@ -4837,7 +4838,7 @@ void GLCanvas3D::_render_background() const
bool use_error_color = false; bool use_error_color = false;
if (wxGetApp().is_editor()) { if (wxGetApp().is_editor()) {
use_error_color = m_dynamic_background_enabled && use_error_color = m_dynamic_background_enabled &&
(wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() != ptSLA || !m_volumes.empty()); (current_printer_technology() != ptSLA || !m_volumes.empty());
if (!m_volumes.empty()) if (!m_volumes.empty())
use_error_color &= _is_any_volume_outside(); use_error_color &= _is_any_volume_outside();
@ -5255,7 +5256,7 @@ void GLCanvas3D::_render_camera_target() const
void GLCanvas3D::_render_sla_slices() const void GLCanvas3D::_render_sla_slices() const
{ {
if (!m_use_clipping_planes || wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() != ptSLA) if (!m_use_clipping_planes || current_printer_technology() != ptSLA)
return; return;
const SLAPrint* print = this->sla_print(); const SLAPrint* print = this->sla_print();

7
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -753,6 +753,9 @@ public:
} }
#endif // ENABLE_SEQUENTIAL_LIMITS #endif // ENABLE_SEQUENTIAL_LIMITS
const Print* fff_print() const;
const SLAPrint* sla_print() const;
private: private:
bool _is_shown_on_screen() const; bool _is_shown_on_screen() const;
@ -858,10 +861,6 @@ private:
float get_overlay_window_width() { return LayersEditing::get_overlay_window_width(); } float get_overlay_window_width() { return LayersEditing::get_overlay_window_width(); }
static std::vector<float> _parse_colors(const std::vector<std::string>& colors); static std::vector<float> _parse_colors(const std::vector<std::string>& colors);
public:
const Print* fff_print() const;
const SLAPrint* sla_print() const;
}; };
} // namespace GUI } // namespace GUI