3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactoring in toolpaths generation

Browse source
This commit is contained in:
enricoturri1966 2020-09-17 08:46:27 +02:00
parent 8579ecceed
commit a40fc1fe2c
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1213,29 +1213,23 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
} }
} }
switch (curr.type) switch (buffer.render_primitive_type)
{ {
case EMoveType::Tool_change: case TBuffer::ERenderPrimitiveType::Point:
case EMoveType::Color_change:
case EMoveType::Pause_Print:
case EMoveType::Custom_GCode:
case EMoveType::Retract:
case EMoveType::Unretract:
{ {
add_as_point(curr, buffer, buffer_vertices, static_cast<unsigned int>(buffer_indices.size()) - 1, buffer_indices.back(), i); add_as_point(curr, buffer, buffer_vertices, static_cast<unsigned int>(buffer_indices.size()) - 1, buffer_indices.back(), i);
break; break;
} }
case EMoveType::Extrude: case TBuffer::ERenderPrimitiveType::Line:
{
add_as_solid(prev, curr, buffer, buffer_vertices, static_cast<unsigned int>(buffer_indices.size()) - 1, buffer_indices.back(), i);
break;
}
case EMoveType::Travel:
{ {
add_as_line(prev, curr, buffer, buffer_vertices, static_cast<unsigned int>(buffer_indices.size()) - 1, buffer_indices.back(), i); add_as_line(prev, curr, buffer, buffer_vertices, static_cast<unsigned int>(buffer_indices.size()) - 1, buffer_indices.back(), i);
break; break;
} }
default: { break; } case TBuffer::ERenderPrimitiveType::Triangle:
{
add_as_solid(prev, curr, buffer, buffer_vertices, static_cast<unsigned int>(buffer_indices.size()) - 1, buffer_indices.back(), i);
break;
}
} }
} }
@ -1670,12 +1664,12 @@ void GCodeViewer::render_toolpaths() const
EOptionsColors color; EOptionsColors color;
switch (buffer_type(i)) switch (buffer_type(i))
{ {
case EMoveType::Tool_change: { color = EOptionsColors::ToolChanges; break; } case EMoveType::Tool_change: { color = EOptionsColors::ToolChanges; break; }
case EMoveType::Color_change: { color = EOptionsColors::ColorChanges; break; } case EMoveType::Color_change: { color = EOptionsColors::ColorChanges; break; }
case EMoveType::Pause_Print: { color = EOptionsColors::PausePrints; break; } case EMoveType::Pause_Print: { color = EOptionsColors::PausePrints; break; }
case EMoveType::Custom_GCode: { color = EOptionsColors::CustomGCodes; break; } case EMoveType::Custom_GCode: { color = EOptionsColors::CustomGCodes; break; }
case EMoveType::Retract: { color = EOptionsColors::Retractions; break; } case EMoveType::Retract: { color = EOptionsColors::Retractions; break; }
case EMoveType::Unretract: { color = EOptionsColors::Unretractions; break; } case EMoveType::Unretract: { color = EOptionsColors::Unretractions; break; }
} }
render_as_points(buffer, static_cast<unsigned int>(j), color, *shader); render_as_points(buffer, static_cast<unsigned int>(j), color, *shader);
break; break;