Fix for infinite loop in Build2DFaces::_find_edge_intersections #76520
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fire
reviewed
Apr 27, 2023
modules/csg/csg.cpp
Outdated
| @@ -1079,14 +1081,30 @@ 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 = { | |||
There was a problem hiding this comment.
LocalVector doesn't work here as the .find(), both for LocalVector (core/templates/local_vector.h(251)) and std Vector, don't seem able to parse LocalVector as a type for equality checking:
error C2678: binary '==': no operator found which takes a left-hand operand of type 'const T' (or there is no acceptable conversion)
with
[
T=LocalVector<Vector2,uint32_t,false,false>
]
I'm a little over my head here trying to parse what would need to change for this to be allowed.
fire
reviewed
Apr 27, 2023
|
Also read our PR guidelines. https://docs.godotengine.org/en/stable/contributing/workflow/pr_workflow.html As far as I can tell you need to git squash and address comments. |
|
Thanks, will do. |
justinwash
force-pushed
the
csg-loop-fix
branch
from
ed535f0
to
bf66a10
Compare
Removes documentation generation (docgen) from the GDScript compiler to its own file. Adds support for GDScript enums and signal parameters and quite a few other assorted fixes and improvements.
justinwash
force-pushed
the
csg-loop-fix
branch
from
bf66a10
to
0b88e7f
Compare
|
I've well and truly destroyed this PR trying to squash it :( Remaking according to the PR Guidelines. Sorry about that. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR solves issue #73927 in which _find_edge_intersections could loop infinitely while creating new faces from edge intersections by keeping track of which edges we have already processed and skipping edges with the same points and uvs that come up in subsequent loops.
Had some concern about the glitchy faces that appear in subtract mode, but that appears to also occur in the most recent master post- #74771 so I'm not sure they really need to be covered in this fix, or if its even related.
This branch working:
https://user-images.githubusercontent.com/6236852/234983317-df6c0734-25f3-4790-80c6-24844062dde8.mp4
Most recent Master branch crashing, also exhibiting similar geometry wonkiness:
https://user-images.githubusercontent.com/6236852/234984769-620a2f24-968e-4a08-9a56-f4cc383c6d27.mp4
Also this is my first time touching both the Godot source and C++ so uh... don't hold back :D