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

Export to obj file only toolpaths visible in 3D scene

Browse source
This commit is contained in:
Enrico Turri 2019-08-20 09:51:25 +02:00
parent 1f6aab312b
commit 730283a9e9
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/slic3r/GUI/3DScene.cpp
View file

@ -872,7 +872,7 @@ void GLVolumeCollection::export_toolpaths_to_obj(const char* filename) const
for (const GLVolume* volume : this->volumes) for (const GLVolume* volume : this->volumes)
{ {
if (!volume->is_extrusion_path) if (!volume->is_active || !volume->is_extrusion_path)
continue; continue;
std::vector<float> vertices_and_normals_interleaved; std::vector<float> vertices_and_normals_interleaved;
@ -896,22 +896,30 @@ void GLVolumeCollection::export_toolpaths_to_obj(const char* filename) const
triangle_indices = volume->indexed_vertex_array.triangle_indices; triangle_indices = volume->indexed_vertex_array.triangle_indices;
else if ((volume->indexed_vertex_array.triangle_indices_VBO_id != 0) && (volume->indexed_vertex_array.triangle_indices_size != 0)) else if ((volume->indexed_vertex_array.triangle_indices_VBO_id != 0) && (volume->indexed_vertex_array.triangle_indices_size != 0))
{ {
triangle_indices = std::vector<int>(volume->indexed_vertex_array.triangle_indices_size, 0); size_t size = std::min(volume->indexed_vertex_array.triangle_indices_size, volume->tverts_range.second - volume->tverts_range.first);
if (size != 0)
{
triangle_indices = std::vector<int>(size, 0);
glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, volume->indexed_vertex_array.triangle_indices_VBO_id)); glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, volume->indexed_vertex_array.triangle_indices_VBO_id));
glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, triangle_indices.size() * sizeof(int), triangle_indices.data())); glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, volume->tverts_range.first * sizeof(int), size * sizeof(int), triangle_indices.data()));
glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
}
} }
if (!volume->indexed_vertex_array.quad_indices.empty()) if (!volume->indexed_vertex_array.quad_indices.empty())
quad_indices = volume->indexed_vertex_array.quad_indices; quad_indices = volume->indexed_vertex_array.quad_indices;
if ((volume->indexed_vertex_array.quad_indices_VBO_id != 0) && (volume->indexed_vertex_array.quad_indices_size != 0)) if ((volume->indexed_vertex_array.quad_indices_VBO_id != 0) && (volume->indexed_vertex_array.quad_indices_size != 0))
{ {
quad_indices = std::vector<int>(volume->indexed_vertex_array.quad_indices_size, 0); size_t size = std::min(volume->indexed_vertex_array.quad_indices_size, volume->qverts_range.second - volume->qverts_range.first);
if (size != 0)
{
quad_indices = std::vector<int>(size, 0);
glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, volume->indexed_vertex_array.quad_indices_VBO_id)); glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, volume->indexed_vertex_array.quad_indices_VBO_id));
glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, quad_indices.size() * sizeof(int), quad_indices.data())); glsafe(::glGetBufferSubData(GL_ELEMENT_ARRAY_BUFFER, volume->qverts_range.first * sizeof(int), size * sizeof(int), quad_indices.data()));
glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
}
} }
if (triangle_indices.empty() && quad_indices.empty()) if (triangle_indices.empty() && quad_indices.empty())

2
src/slic3r/GUI/3DScene.hpp
View file

@ -439,7 +439,7 @@ public:
bool empty() const { return this->indexed_vertex_array.empty(); } bool empty() const { return this->indexed_vertex_array.empty(); }
void set_range(coordf_t low, coordf_t high); void set_range(double low, double high);
void render() const; void render() const;
void render(int color_id, int detection_id, int worldmatrix_id) const; void render(int color_id, int detection_id, int worldmatrix_id) const;