3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

GCodeViewer -> Reduced vertices count when generating solid toolpaths

Browse source
This commit is contained in:
enricoturri1966 2020-08-28 12:28:21 +02:00
parent d07d5e36de
commit 1c2ef87cfa
2 changed files with 61 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -994,37 +994,69 @@ void GCodeViewer::load_toolpaths(const GCodeProcessor::Result& gcode_result)
Vec3f prev_pos = prev.position - half_height * up; Vec3f prev_pos = prev.position - half_height * up;
Vec3f curr_pos = curr.position - half_height * up; Vec3f curr_pos = curr.position - half_height * up;
// vertices 1st endpoint Path& last_path = buffer.paths.back();
store_vertex(buffer_vertices, prev_pos + half_height * up, up); // top if (last_path.vertices_count() == 1) {
store_vertex(buffer_vertices, prev_pos + half_width * right, right); // right // vertices 1st endpoint
store_vertex(buffer_vertices, prev_pos - half_height * up, -up); // bottom store_vertex(buffer_vertices, prev_pos + half_height * up, up); // top
store_vertex(buffer_vertices, prev_pos - half_width * right, -right); // left store_vertex(buffer_vertices, prev_pos + half_width * right, right); // right
store_vertex(buffer_vertices, prev_pos - half_height * up, -up); // bottom
store_vertex(buffer_vertices, prev_pos - half_width * right, -right); // left
// vertices 2nd endpoint // vertices 2nd endpoint
store_vertex(buffer_vertices, curr_pos + half_height * up, up); // top store_vertex(buffer_vertices, curr_pos + half_height * up, up); // top
store_vertex(buffer_vertices, curr_pos + half_width * right, right); // right store_vertex(buffer_vertices, curr_pos + half_width * right, right); // right
store_vertex(buffer_vertices, curr_pos - half_height * up, -up); // bottom store_vertex(buffer_vertices, curr_pos - half_height * up, -up); // bottom
store_vertex(buffer_vertices, curr_pos - half_width * right, -right); // left store_vertex(buffer_vertices, curr_pos - half_width * right, -right); // left
// triangles starting cap // triangles starting cap
store_triangle(buffer_indices, starting_vertices_size + 0, starting_vertices_size + 2, starting_vertices_size + 1); store_triangle(buffer_indices, starting_vertices_size + 0, starting_vertices_size + 2, starting_vertices_size + 1);
store_triangle(buffer_indices, starting_vertices_size + 0, starting_vertices_size + 3, starting_vertices_size + 2); store_triangle(buffer_indices, starting_vertices_size + 0, starting_vertices_size + 3, starting_vertices_size + 2);
// triangles sides // triangles sides
store_triangle(buffer_indices, starting_vertices_size + 0, starting_vertices_size + 1, starting_vertices_size + 4); store_triangle(buffer_indices, starting_vertices_size + 0, starting_vertices_size + 1, starting_vertices_size + 4);
store_triangle(buffer_indices, starting_vertices_size + 1, starting_vertices_size + 5, starting_vertices_size + 4); store_triangle(buffer_indices, starting_vertices_size + 1, starting_vertices_size + 5, starting_vertices_size + 4);
store_triangle(buffer_indices, starting_vertices_size + 1, starting_vertices_size + 2, starting_vertices_size + 5); store_triangle(buffer_indices, starting_vertices_size + 1, starting_vertices_size + 2, starting_vertices_size + 5);
store_triangle(buffer_indices, starting_vertices_size + 2, starting_vertices_size + 6, starting_vertices_size + 5); store_triangle(buffer_indices, starting_vertices_size + 2, starting_vertices_size + 6, starting_vertices_size + 5);
store_triangle(buffer_indices, starting_vertices_size + 2, starting_vertices_size + 3, starting_vertices_size + 6); store_triangle(buffer_indices, starting_vertices_size + 2, starting_vertices_size + 3, starting_vertices_size + 6);
store_triangle(buffer_indices, starting_vertices_size + 3, starting_vertices_size + 7, starting_vertices_size + 6); store_triangle(buffer_indices, starting_vertices_size + 3, starting_vertices_size + 7, starting_vertices_size + 6);
store_triangle(buffer_indices, starting_vertices_size + 3, starting_vertices_size + 0, starting_vertices_size + 7); store_triangle(buffer_indices, starting_vertices_size + 3, starting_vertices_size + 0, starting_vertices_size + 7);
store_triangle(buffer_indices, starting_vertices_size + 0, starting_vertices_size + 4, starting_vertices_size + 7); store_triangle(buffer_indices, starting_vertices_size + 0, starting_vertices_size + 4, starting_vertices_size + 7);
// triangles ending cap // triangles ending cap
store_triangle(buffer_indices, starting_vertices_size + 4, starting_vertices_size + 6, starting_vertices_size + 7); store_triangle(buffer_indices, starting_vertices_size + 4, starting_vertices_size + 6, starting_vertices_size + 7);
store_triangle(buffer_indices, starting_vertices_size + 4, starting_vertices_size + 5, starting_vertices_size + 6); store_triangle(buffer_indices, starting_vertices_size + 4, starting_vertices_size + 5, starting_vertices_size + 6);
}
else {
// vertices 1st endpoint
store_vertex(buffer_vertices, prev_pos + half_width * right, right); // right
store_vertex(buffer_vertices, prev_pos - half_width * right, -right); // left
buffer.paths.back().last = { static_cast<unsigned int>(buffer_indices.size() - 1), static_cast<unsigned int>(move_id), curr.position }; // vertices 2nd endpoint
store_vertex(buffer_vertices, curr_pos + half_height * up, up); // top
store_vertex(buffer_vertices, curr_pos + half_width * right, right); // right
store_vertex(buffer_vertices, curr_pos - half_height * up, -up); // bottom
store_vertex(buffer_vertices, curr_pos - half_width * right, -right); // left
// triangles starting cap
store_triangle(buffer_indices, starting_vertices_size - 4, starting_vertices_size - 2, starting_vertices_size + 0);
store_triangle(buffer_indices, starting_vertices_size - 4, starting_vertices_size + 1, starting_vertices_size - 2);
// triangles sides
store_triangle(buffer_indices, starting_vertices_size - 4, starting_vertices_size + 0, starting_vertices_size + 2);
store_triangle(buffer_indices, starting_vertices_size + 0, starting_vertices_size + 3, starting_vertices_size + 2);
store_triangle(buffer_indices, starting_vertices_size + 0, starting_vertices_size - 2, starting_vertices_size + 3);
store_triangle(buffer_indices, starting_vertices_size - 2, starting_vertices_size + 4, starting_vertices_size + 3);
store_triangle(buffer_indices, starting_vertices_size - 2, starting_vertices_size + 1, starting_vertices_size + 4);
store_triangle(buffer_indices, starting_vertices_size + 1, starting_vertices_size + 5, starting_vertices_size + 4);
store_triangle(buffer_indices, starting_vertices_size + 1, starting_vertices_size - 4, starting_vertices_size + 5);
store_triangle(buffer_indices, starting_vertices_size - 4, starting_vertices_size + 2, starting_vertices_size + 5);
// triangles ending cap
store_triangle(buffer_indices, starting_vertices_size + 2, starting_vertices_size + 4, starting_vertices_size + 5);
store_triangle(buffer_indices, starting_vertices_size + 2, starting_vertices_size + 3, starting_vertices_size + 4);
}
last_path.last = { static_cast<unsigned int>(buffer_indices.size() - 1), static_cast<unsigned int>(move_id), curr.position };
}; };
// toolpaths data -> extract from result // toolpaths data -> extract from result
@ -1299,7 +1331,7 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
for (const TBuffer& buffer : m_buffers) { for (const TBuffer& buffer : m_buffers) {
// searches the path containing the current position // searches the path containing the current position
for (const Path& path : buffer.paths) { for (const Path& path : buffer.paths) {
if (path.first.s_id <= m_sequential_view.current.last && m_sequential_view.current.last <= path.last.s_id) { if (path.contains(m_sequential_view.current.last)) {
unsigned int offset = m_sequential_view.current.last - path.first.s_id; unsigned int offset = m_sequential_view.current.last - path.first.s_id;
if (offset > 0) { if (offset > 0) {
if (buffer.primitive_type == TBuffer::EPrimitiveType::Line) if (buffer.primitive_type == TBuffer::EPrimitiveType::Line)

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

@ -133,6 +133,8 @@ class GCodeViewer
unsigned char cp_color_id{ 0 }; unsigned char cp_color_id{ 0 };
bool matches(const GCodeProcessor::MoveVertex& move) const; bool matches(const GCodeProcessor::MoveVertex& move) const;
size_t vertices_count() const { return last.s_id - first.s_id + 1; }
bool contains(unsigned int id) const { return first.s_id <= id && id <= last.s_id; }
}; };
// Used to batch the indices needed to render paths // Used to batch the indices needed to render paths