From 5627413b23e00d02789d964abdd331ec9d058a2c Mon Sep 17 00:00:00 2001 From: "lane.wei" Date: Tue, 18 Oct 2022 23:33:55 +0800 Subject: [PATCH] ENH: disable wireframe currently there are some issues need to be solved Change-Id: I107db3d9411d2487c4c6fb65d54763896c3954b5 --- src/slic3r/GUI/3DScene.cpp | 8 ++++---- src/slic3r/GUI/GLShadersManager.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index 92f2eb9b3..a6ea563e1 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -869,10 +869,10 @@ void GLVolume::render(bool with_outline) const std::array body_color = { 1.0f, 1.0f, 1.0f, 1.0f }; //red shader->set_uniform("uniform_color", body_color); - if (GUI::wxGetApp().plater()->is_show_wireframe()) - shader->set_uniform("show_wireframe", true); - else - shader->set_uniform("show_wireframe", false); + //if (GUI::wxGetApp().plater()->is_show_wireframe()) + // shader->set_uniform("show_wireframe", true); + //else + // shader->set_uniform("show_wireframe", false); shader->set_uniform("is_outline", true); glsafe(::glPopMatrix()); glsafe(::glPushMatrix()); diff --git a/src/slic3r/GUI/GLShadersManager.cpp b/src/slic3r/GUI/GLShadersManager.cpp index a2475c70f..74668fb20 100644 --- a/src/slic3r/GUI/GLShadersManager.cpp +++ b/src/slic3r/GUI/GLShadersManager.cpp @@ -45,7 +45,7 @@ std::pair GLShadersManager::init() // used to render extrusion and travel paths as lines in gcode preview valid &= append_shader("toolpaths_lines", { "toolpaths_lines.vs", "toolpaths_lines.fs" }); // used to render objects in 3d editor - if (GUI::wxGetApp().is_gl_version_greater_or_equal_to(3, 0)) { + if (0) { valid &= append_shader("gouraud", { "gouraud_130.vs", "gouraud_130.fs" } #if ENABLE_ENVIRONMENT_MAP , { "ENABLE_ENVIRONMENT_MAP"sv }