diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-10 15:08:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-10 15:08:32 +0200 |
| commit | edf61c077c1b1f5e928a653909bf30d6cbea48aa (patch) | |
| tree | da0bba3ef520cb11c4080e192c0121b13e8cc0f6 /modules/csg/csg.cpp | |
| parent | b6983eeccf8bc01e2a5ca973e14ce46a2e14df87 (diff) | |
| parent | f07021fbeb7d91011c1534702042697d246551ac (diff) | |
Merge pull request #60917 from akien-mga/ci-emscripten-3.1.10
Diffstat (limited to 'modules/csg/csg.cpp')
| -rw-r--r-- | modules/csg/csg.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp index e0cc0f8234..177014e5a7 100644 --- a/modules/csg/csg.cpp +++ b/modules/csg/csg.cpp @@ -1387,13 +1387,13 @@ void CSGBrushOperation::update_faces(const CSGBrush &p_brush_a, const int p_face } // Ensure B has points either side of or in the plane of A. - int in_plane_count = 0, over_count = 0, under_count = 0; + int over_count = 0, under_count = 0; Plane plane_a(vertices_a[0], vertices_a[1], vertices_a[2]); ERR_FAIL_COND_MSG(plane_a.normal == Vector3(), "Couldn't form plane from Brush A face."); for (int i = 0; i < 3; i++) { if (plane_a.has_point(vertices_b[i])) { - in_plane_count++; + // In plane. } else if (plane_a.is_point_over(vertices_b[i])) { over_count++; } else { @@ -1406,7 +1406,6 @@ void CSGBrushOperation::update_faces(const CSGBrush &p_brush_a, const int p_face } // Ensure A has points either side of or in the plane of B. - in_plane_count = 0; over_count = 0; under_count = 0; Plane plane_b(vertices_b[0], vertices_b[1], vertices_b[2]); @@ -1414,7 +1413,7 @@ void CSGBrushOperation::update_faces(const CSGBrush &p_brush_a, const int p_face for (int i = 0; i < 3; i++) { if (plane_b.has_point(vertices_a[i])) { - in_plane_count++; + // In plane. } else if (plane_b.is_point_over(vertices_a[i])) { over_count++; } else { |