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

Use multiple index buffers to render toolpaths in preview

Browse Source
This commit is contained in:
enricoturri1966 2020-09-16 15:45:53 +02:00
parent 743d6643ae
commit 7a10e23470
2 changed files with 480 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

860
src/slic3r/GUI/GCodeViewer.cpp
View File

File diff suppressed because it is too large Load Diff

31
src/slic3r/GUI/GCodeViewer.hpp
View File

@ -18,6 +18,9 @@ namespace GUI {
class GCodeViewer class GCodeViewer
{ {
using Color = std::array<float, 3>; using Color = std::array<float, 3>;
using IndexBuffer = std::vector<unsigned int>;
using MultiIndexBuffer = std::vector<IndexBuffer>;
static const std::vector<Color> Extrusion_Role_Colors; static const std::vector<Color> Extrusion_Role_Colors;
static const std::vector<Color> Options_Colors; static const std::vector<Color> Options_Colors;
static const std::vector<Color> Travel_Colors; static const std::vector<Color> Travel_Colors;
@ -112,10 +115,12 @@ class GCodeViewer
{ {
struct Endpoint struct Endpoint
{ {
// index into the indices buffer // index of the index buffer
unsigned int i_id{ 0u }; unsigned int b_id{ 0 };
// sequential id // index into the index buffer
unsigned int s_id{ 0u }; size_t i_id{ 0 };
// sequential id (index into the vertex buffer)
size_t s_id{ 0 };
Vec3f position{ Vec3f::Zero() }; Vec3f position{ Vec3f::Zero() };
}; };
@ -134,14 +139,15 @@ class GCodeViewer
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; } 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; } bool contains(size_t 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
struct RenderPath struct RenderPath
{ {
Color color; Color color;
size_t path_id; unsigned int path_id;
unsigned int index_buffer_id;
std::vector<unsigned int> sizes; std::vector<unsigned int> sizes;
std::vector<size_t> offsets; // use size_t because we need an unsigned int whose size matches pointer's size (used in the call glMultiDrawElements()) std::vector<size_t> offsets; // use size_t because we need an unsigned int whose size matches pointer's size (used in the call glMultiDrawElements())
}; };
@ -158,7 +164,7 @@ class GCodeViewer
ERenderPrimitiveType render_primitive_type; ERenderPrimitiveType render_primitive_type;
VBuffer vertices; VBuffer vertices;
IBuffer indices; std::vector<IBuffer> indices;
std::string shader; std::string shader;
std::vector<Path> paths; std::vector<Path> paths;
@ -166,7 +172,10 @@ class GCodeViewer
bool visible{ false }; bool visible{ false };
void reset(); void reset();
void add_path(const GCodeProcessor::MoveVertex& move, unsigned int i_id, unsigned int s_id); // b_id index of buffer contained in this->indices
// i_id index of first index contained in this->indices[b_id]
// s_id index of first vertex contained in this->vertices
void add_path(const GCodeProcessor::MoveVertex& move, unsigned int b_id, size_t i_id, size_t s_id);
unsigned int indices_per_segment() const { unsigned int indices_per_segment() const {
switch (render_primitive_type) switch (render_primitive_type)
{ {
@ -194,6 +203,8 @@ class GCodeViewer
default: { return 0; } default: { return 0; }
} }
} }
bool has_data() const { return vertices.id != 0 && !indices.empty() && indices.front().id != 0; }
}; };
// helper to render shells // helper to render shells
@ -350,8 +361,8 @@ public:
struct Endpoints struct Endpoints
{ {
unsigned int first{ 0 }; size_t first{ 0 };
unsigned int last{ 0 }; size_t last{ 0 };
}; };
Endpoints endpoints; Endpoints endpoints;