GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 19:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#11821: Fixed bug in generation of volumes in pre-gcode view for brim/skirt elements, thanks to @supermerill

Browse Source
This commit is contained in:
enricoturri1966 2023-12-05 09:48:24 +01:00
parent bf3772d68a
commit 62ff444a1e
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -90,7 +90,7 @@ static const Slic3r::ColorRGBA ERROR_BG_DARK_COLOR = { 0.478f, 0.192f, 0.039f
static const Slic3r::ColorRGBA ERROR_BG_LIGHT_COLOR = { 0.753f, 0.192f, 0.039f, 1.0f }; static const Slic3r::ColorRGBA ERROR_BG_LIGHT_COLOR = { 0.753f, 0.192f, 0.039f, 1.0f };
// Number of floats // Number of floats
static constexpr const size_t MAX_VERTEX_BUFFER_SIZE = 131072 * 6; // 3.15MB static constexpr const size_t MAX_VERTEX_BUFFER_SIZE = 131072 * 6; // 3.15MB
#define SHOW_IMGUI_DEMO_WINDOW #define SHOW_IMGUI_DEMO_WINDOW
#ifdef SHOW_IMGUI_DEMO_WINDOW #ifdef SHOW_IMGUI_DEMO_WINDOW
@ -6837,14 +6837,22 @@ void GLCanvas3D::_load_print_toolpaths(const BuildVolume &build_volume)
_3DScene::extrusionentity_to_verts(print->brim(), print_zs[i], Point(0, 0), init_data); _3DScene::extrusionentity_to_verts(print->brim(), print_zs[i], Point(0, 0), init_data);
_3DScene::extrusionentity_to_verts(print->skirt(), print_zs[i], Point(0, 0), init_data); _3DScene::extrusionentity_to_verts(print->skirt(), print_zs[i], Point(0, 0), init_data);
// Ensure that no volume grows over the limits. If the volume is too large, allocate a new one. // Ensure that no volume grows over the limits. If the volume is too large, allocate a new one.
if (init_data.vertices_size_bytes() > MAX_VERTEX_BUFFER_SIZE) { if (init_data.vertices_size_bytes() >= MAX_VERTEX_BUFFER_SIZE) {
volume->model.init_from(std::move(init_data)); volume->model.init_from(std::move(init_data));
GLVolume &vol = *volume; volume->is_outside = !contains(build_volume, volume->model);
volume = m_volumes.new_toolpath_volume(vol.color); volume = m_volumes.new_toolpath_volume(volume->color);
init_data = GLModel::Geometry();
} }
} }
volume->model.init_from(std::move(init_data)); init_data = GLModel::Geometry();
volume->is_outside = !contains(build_volume, volume->model); if (init_data.is_empty()) {
delete volume;
m_volumes.volumes.pop_back();
}
else {
volume->model.init_from(std::move(init_data));
volume->is_outside = !contains(build_volume, volume->model);
}
} }
void GLCanvas3D::_load_print_object_toolpaths(const PrintObject& print_object, const BuildVolume& build_volume, const std::vector<std::string>& str_tool_colors, const std::vector<CustomGCode::Item>& color_print_values) void GLCanvas3D::_load_print_object_toolpaths(const PrintObject& print_object, const BuildVolume& build_volume, const std::vector<std::string>& str_tool_colors, const std::vector<CustomGCode::Item>& color_print_values)