From eb7f53d6c11b8228cb80312fa5cbf01dc76308bd Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Thu, 31 Aug 2023 19:19:35 +0800 Subject: [PATCH] FIX: modify enforcer and blocker color Jira: STUDIO-4304 Change-Id: I1d58d1b61929a831fc87f53ef364eb0d1af91c17 (cherry picked from commit 40022ec91a15f2663ce51948118fe2a5b716ecdf) --- resources/shaders/mm_gouraud.fs | 2 +- src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/shaders/mm_gouraud.fs b/resources/shaders/mm_gouraud.fs index 4a74d75b5..ee78991a3 100644 --- a/resources/shaders/mm_gouraud.fs +++ b/resources/shaders/mm_gouraud.fs @@ -58,7 +58,7 @@ void main() } else if( transformed_normal.z < slope.normal_z - EPSILON) { - color = color * 0.5 + LightRed * 0.5; + color = color * 0.7 + LightRed * 0.3; alpha = 1.0; } } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp index 2bbab7887..eeba58771 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp @@ -84,8 +84,8 @@ public: }; // BBS - static constexpr std::array enforcers_color{ 0.5f, 1.f, 0.5f, 1.f }; - static constexpr std::array blockers_color{ 1.f, 0.5f, 0.5f, 1.f }; + static constexpr std::array enforcers_color{0.627f, 0.627f, 0.827f, 1.0f};//=GLVolume::SUPPORT_ENFORCER_COL + static constexpr std::array blockers_color{0.823f, 0.627f, 0.627f, 1.0f};//=GLVolume::SUPPORT_BLOCKER_COL #ifdef PRUSASLICER_TRIANGLE_SELECTOR_DEBUG void render_debug(ImGuiWrapper* imgui);