3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-24 09:11:23 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ENABLE_GCODE_VIEWER -> Removed options_120_solid shader

Browse source
This commit is contained in:
enricoturri1966 2020-08-19 11:25:12 +02:00
parent af200e47c1
commit d91fc7b8ab
5 changed files with 5 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -2479,8 +2479,8 @@ void GCodeViewer::render_statistics() const
void GCodeViewer::render_shaders_editor() const
{
auto set_shader = [this](const std::string& shader) {
unsigned char begin_id = buffer_id(GCodeProcessor::EMoveType::Retract);
unsigned char end_id = buffer_id(GCodeProcessor::EMoveType::Custom_GCode);
unsigned char begin_id = buffer_id(EMoveType::Retract);
unsigned char end_id = buffer_id(EMoveType::Custom_GCode);
for (unsigned char i = begin_id; i <= end_id; ++i) {
m_buffers[i].shader = shader;
}
@ -2497,7 +2497,6 @@ void GCodeViewer::render_shaders_editor() const
if (ImGui::TreeNode("GLSL version")) {
ImGui::RadioButton("1.10 (low end PCs)", &m_shaders_editor.points.shader_version, 0);
ImGui::RadioButton("1.20 flat (billboards) [default]", &m_shaders_editor.points.shader_version, 1);
ImGui::RadioButton("1.20 solid (spheres)", &m_shaders_editor.points.shader_version, 2);
ImGui::TreePop();
}
@ -2505,7 +2504,6 @@ void GCodeViewer::render_shaders_editor() const
{
case 0: { set_shader("options_110"); break; }
case 1: { set_shader("options_120_flat"); break; }
case 2: { set_shader("options_120_solid"); break; }
}
if (ImGui::TreeNode("Options")) {

4
src/slic3r/GUI/GCodeViewer.hpp
View file

@ -33,7 +33,7 @@ class GCodeViewer
CustomGCodes
};
// vbo buffer containing vertices data for a specific toolpath type
// vbo buffer containing vertices data used to rendder a specific toolpath type
struct VBuffer
{
enum class EFormat : unsigned char
@ -65,7 +65,7 @@ class GCodeViewer
void reset();
};
// ibo buffer containing indices data for a specific toolpath type
// ibo buffer containing indices data (triangles) used to render a specific toolpath type
struct IBuffer
{
// ibo id

4
src/slic3r/GUI/GLShadersManager.cpp
View file

@ -35,10 +35,8 @@ std::pair<bool, std::string> GLShadersManager::init()
valid &= append_shader("printbed", { "printbed.vs", "printbed.fs" });
// used to render options in gcode preview
valid &= append_shader("options_110", { "options_110.vs", "options_110.fs" });
if (GUI::wxGetApp().is_glsl_version_greater_or_equal_to(1, 20)) {
if (GUI::wxGetApp().is_glsl_version_greater_or_equal_to(1, 20))
valid &= append_shader("options_120_flat", { "options_120_flat.vs", "options_120_flat.fs" });
valid &= append_shader("options_120_solid", { "options_120_solid.vs", "options_120_solid.fs" });
}
// used to render extrusion and travel paths in gcode preview
valid &= append_shader("toolpaths", { "toolpaths.vs", "toolpaths.fs" });
// used to render objects in 3d editor