Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix infinite loop in CSG Build2DFaces::_find_edge_intersections #76521

Merged
merged 1 commit into from
Apr 28, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions modules/csg/csg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,8 @@ void CSGBrushOperation::Build2DFaces::_merge_faces(const Vector<int> &p_segment_
}

void CSGBrushOperation::Build2DFaces::_find_edge_intersections(const Vector2 p_segment_points[2], Vector<int> &r_segment_indices) {
LocalVector<Vector<Vector2>> processed_edges;

// For each face.
for (int face_idx = 0; face_idx < faces.size(); ++face_idx) {
Face2D face = faces[face_idx];
Expand All @@ -1079,17 +1081,32 @@ void CSGBrushOperation::Build2DFaces::_find_edge_intersections(const Vector2 p_s

// Check each edge.
for (int face_edge_idx = 0; face_edge_idx < 3; ++face_edge_idx) {
Vector2 edge_points[2] = {
Vector<Vector2> edge_points_and_uvs = {
face_vertices[face_edge_idx].point,
face_vertices[(face_edge_idx + 1) % 3].point
};
Vector2 edge_uvs[2] = {
face_vertices[(face_edge_idx + 1) % 3].point,
face_vertices[face_edge_idx].uv,
face_vertices[(face_edge_idx + 1) % 3].uv
};
Vector2 intersection_point;

Vector2 edge_points[2] = {
edge_points_and_uvs[0],
edge_points_and_uvs[1],
};
Vector2 edge_uvs[2] = {
edge_points_and_uvs[2],
edge_points_and_uvs[3],
};

// Check if edge has already been processed.
if (processed_edges.find(edge_points_and_uvs) != -1) {
continue;
}

processed_edges.push_back(edge_points_and_uvs);

// First check if the ends of the segment are on the edge.
Vector2 intersection_point;

bool on_edge = false;
for (int edge_point_idx = 0; edge_point_idx < 2; ++edge_point_idx) {
intersection_point = Geometry2D::get_closest_point_to_segment(p_segment_points[edge_point_idx], edge_points);
Expand Down