mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: disable wireframe currently 

there are some issues need to be solved

Change-Id: I107db3d9411d2487c4c6fb65d54763896c3954b5
This commit is contained in:
lane.wei 2022-10-18 23:33:55 +08:00 committed by Lane.Wei
parent 6844c694b5
commit 5627413b23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/3DScene.cpp
View File

@ -869,10 +869,10 @@ void GLVolume::render(bool with_outline) const
std::array<float, 4> body_color = { 1.0f, 1.0f, 1.0f, 1.0f }; //red std::array<float, 4> body_color = { 1.0f, 1.0f, 1.0f, 1.0f }; //red
shader->set_uniform("uniform_color", body_color); shader->set_uniform("uniform_color", body_color);
if (GUI::wxGetApp().plater()->is_show_wireframe()) //if (GUI::wxGetApp().plater()->is_show_wireframe())
shader->set_uniform("show_wireframe", true); // shader->set_uniform("show_wireframe", true);
else //else
shader->set_uniform("show_wireframe", false); // shader->set_uniform("show_wireframe", false);
shader->set_uniform("is_outline", true); shader->set_uniform("is_outline", true);
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());

2
src/slic3r/GUI/GLShadersManager.cpp
View File

@ -45,7 +45,7 @@ std::pair<bool, std::string> GLShadersManager::init()
// used to render extrusion and travel paths as lines in gcode preview // used to render extrusion and travel paths as lines in gcode preview
valid &= append_shader("toolpaths_lines", { "toolpaths_lines.vs", "toolpaths_lines.fs" }); valid &= append_shader("toolpaths_lines", { "toolpaths_lines.vs", "toolpaths_lines.fs" });
// used to render objects in 3d editor // 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" } valid &= append_shader("gouraud", { "gouraud_130.vs", "gouraud_130.fs" }
#if ENABLE_ENVIRONMENT_MAP #if ENABLE_ENVIRONMENT_MAP
, { "ENABLE_ENVIRONMENT_MAP"sv } , { "ENABLE_ENVIRONMENT_MAP"sv }