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

Fix potential crashes in SLA normal calculation routine

Browse Source
This commit is contained in:
tamasmeszaros 2022-09-08 11:50:58 +02:00
parent 5ecacdc66c
commit 9ef826cb5f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libslic3r/MeshNormals.cpp
View File

@ -24,6 +24,7 @@ Vec3d get_normal(const AABBMesh &mesh,
Vec3d p; Vec3d p;
mesh.squared_distance(picking_point, faceid, p); mesh.squared_distance(picking_point, faceid, p);
assert(int(faceid) < int(mesh.get_triangle_mesh()->indices.size()));
auto trindex = mesh.indices(faceid); auto trindex = mesh.indices(faceid);
@ -89,9 +90,10 @@ Vec3d get_normal(const AABBMesh &mesh,
} }
} else if (edge_idx >= 0) { // the point is on and edge } else if (edge_idx >= 0) { // the point is on and edge
size_t neighbor_face = mesh.face_neighbor_index()[faceid](edge_idx); size_t neighbor_face = mesh.face_neighbor_index()[faceid](edge_idx);
if (neighbor_face < mesh.indices().size()) {
neigh.emplace_back(mesh.normal_by_face_id(faceid)); neigh.emplace_back(mesh.normal_by_face_id(faceid));
neigh.emplace_back(mesh.normal_by_face_id(neighbor_face)); neigh.emplace_back(mesh.normal_by_face_id(neighbor_face));
}
} }
if (!neigh.empty()) { // there were neighbors to count with if (!neigh.empty()) { // there were neighbors to count with

1
src/libslic3r/SLA/SupportTreeUtils.hpp
View File

@ -517,6 +517,7 @@ bool optimize_pinhead_placement(Ex policy,
Head &head) Head &head)
{ {
Vec3d n = get_normal(m.emesh, head.pos); Vec3d n = get_normal(m.emesh, head.pos);
assert(std::abs(n.norm() - 1.0) < EPSILON);
// for all normals the spherical coordinates are generated and // for all normals the spherical coordinates are generated and
// the polar angle is saturated to 45 degrees from the bottom then // the polar angle is saturated to 45 degrees from the bottom then