From 5cb3fc86c5aa8e5e31a2bb0dd326496d09f970e8 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Fri, 5 Jan 2024 10:49:37 +0800 Subject: [PATCH] FIX:don't use clipping plane in text gizmo Jira:STUDIO-5811 when z<0, text is clipped Change-Id: I051a0733cdc3255867b5eb586e07ca2928a9aea8 --- src/slic3r/GUI/GLCanvas3D.cpp | 11 ++++++++++- src/slic3r/GUI/GLCanvas3D.hpp | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 3140b05c8..7f43fe3a7 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1510,8 +1510,17 @@ Camera& GLCanvas3D::get_camera() return camera; } -void GLCanvas3D::set_color_by(const std::string& value) +void GLCanvas3D::set_use_clipping_planes(bool use) { + if (m_gizmos.get_current_type() == GLGizmosManager::EType::Text) { + m_use_clipping_planes = false; + } + else{ + m_use_clipping_planes = use; + } +} + +void GLCanvas3D::set_color_by(const std::string &value) { m_color_by = value; } diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 948d824ce..081630449 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -762,7 +762,7 @@ public: } } void reset_clipping_planes_cache() { m_sla_caps[0].triangles.clear(); m_sla_caps[1].triangles.clear(); } - void set_use_clipping_planes(bool use) { m_use_clipping_planes = use; } + void set_use_clipping_planes(bool use); bool get_use_clipping_planes() const { return m_use_clipping_planes; } const std::array &get_clipping_planes() const { return m_clipping_planes; };