From 041fae8148f725e95772b3b964c96264c62d2b47 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Fri, 30 Nov 2018 15:31:47 +0100 Subject: [PATCH] Added the bed texture for SL1 --- resources/icons/bed/sl1_bottom.png | Bin 0 -> 20417 bytes resources/icons/bed/sl1_top.png | Bin 0 -> 20344 bytes src/slic3r/GUI/GLCanvas3D.cpp | 88 ++++++++++++----------------- src/slic3r/GUI/GLCanvas3D.hpp | 5 +- 4 files changed, 38 insertions(+), 55 deletions(-) create mode 100644 resources/icons/bed/sl1_bottom.png create mode 100644 resources/icons/bed/sl1_top.png diff --git a/resources/icons/bed/sl1_bottom.png b/resources/icons/bed/sl1_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..bbd172837f0df7c2c62375c0d95ee2f86124354d GIT binary patch literal 20417 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‡n?7yb8yml5v6g#_$ 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 literal 0 HcmV?d00001 diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 2eb1464ba9..e1771f60d5 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -309,7 +309,7 @@ GLCanvas3D::Bed::Bed() bool GLCanvas3D::Bed::is_prusa() const { - return (m_type == MK2) || (m_type == MK3); + return (m_type == MK2) || (m_type == MK3) || (m_type == SL1); } bool GLCanvas3D::Bed::is_custom() const @@ -371,12 +371,17 @@ void GLCanvas3D::Bed::render(float theta) const { case MK2: { - _render_mk2(theta); + _render_prusa("mk2", theta); break; } case MK3: { - _render_mk3(theta); + _render_prusa("mk3", theta); + break; + } + case SL1: + { + _render_prusa("sl1", theta); break; } default: @@ -445,22 +450,31 @@ GLCanvas3D::Bed::EType GLCanvas3D::Bed::_detect_type() const const Preset* curr = &bundle->printers.get_selected_preset(); while (curr != nullptr) { - if (curr->config.has("bed_shape") && _are_equal(m_shape, dynamic_cast(curr->config.option("bed_shape"))->values)) - { - if ((curr->vendor != nullptr) && (curr->vendor->name == "Prusa Research")) - { - if (boost::contains(curr->name, "MK2")) - { - type = MK2; - break; - } - else if (boost::contains(curr->name, "MK3")) - { - type = MK3; - break; - } - } - } + if (curr->config.has("bed_shape")) + { + if (boost::contains(curr->name, "SL1")) + { + //FIXME add a condition on the size of the print bed? + type = SL1; + break; + } + else if (_are_equal(m_shape, dynamic_cast(curr->config.option("bed_shape"))->values)) + { + if ((curr->vendor != nullptr) && (curr->vendor->name == "Prusa Research")) + { + if (boost::contains(curr->name, "MK2")) + { + type = MK2; + break; + } + else if (boost::contains(curr->name, "MK3")) + { + type = MK3; + break; + } + } + } + } curr = bundle->printers.get_preset_parent(*curr); } @@ -469,9 +483,9 @@ GLCanvas3D::Bed::EType GLCanvas3D::Bed::_detect_type() const return type; } -void GLCanvas3D::Bed::_render_mk2(float theta) const +void GLCanvas3D::Bed::_render_prusa(const std::string &key, float theta) const { - std::string filename = resources_dir() + "/icons/bed/mk2_top.png"; + std::string filename = resources_dir() + "/icons/bed/" + key + "_top.png"; if ((m_top_texture.get_id() == 0) || (m_top_texture.get_source() != filename)) { if (!m_top_texture.load_from_file(filename, true)) @@ -481,7 +495,7 @@ void GLCanvas3D::Bed::_render_mk2(float theta) const } } - filename = resources_dir() + "/icons/bed/mk2_bottom.png"; + filename = resources_dir() + "/icons/bed/" + key + "_bottom.png"; if ((m_bottom_texture.get_id() == 0) || (m_bottom_texture.get_source() != filename)) { if (!m_bottom_texture.load_from_file(filename, true)) @@ -491,36 +505,6 @@ void GLCanvas3D::Bed::_render_mk2(float theta) const } } - _render_prusa(theta); -} - -void GLCanvas3D::Bed::_render_mk3(float theta) const -{ - std::string filename = resources_dir() + "/icons/bed/mk3_top.png"; - if ((m_top_texture.get_id() == 0) || (m_top_texture.get_source() != filename)) - { - if (!m_top_texture.load_from_file(filename, true)) - { - _render_custom(); - return; - } - } - - filename = resources_dir() + "/icons/bed/mk3_bottom.png"; - if ((m_bottom_texture.get_id() == 0) || (m_bottom_texture.get_source() != filename)) - { - if (!m_bottom_texture.load_from_file(filename, true)) - { - _render_custom(); - return; - } - } - - _render_prusa(theta); -} - -void GLCanvas3D::Bed::_render_prusa(float theta) const -{ unsigned int triangles_vcount = m_triangles.get_vertices_count(); if (triangles_vcount > 0) { diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 03e089157b..6567ac9ba8 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -171,6 +171,7 @@ class GLCanvas3D { MK2, MK3, + SL1, Custom, Num_Types }; @@ -206,9 +207,7 @@ class GLCanvas3D void _calc_triangles(const ExPolygon& poly); void _calc_gridlines(const ExPolygon& poly, const BoundingBox& bed_bbox); EType _detect_type() const; - void _render_mk2(float theta) const; - void _render_mk3(float theta) const; - void _render_prusa(float theta) const; + void _render_prusa(const std::string &key, float theta) const; void _render_custom() const; static bool _are_equal(const Pointfs& bed_1, const Pointfs& bed_2); };