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.

Sign up for GitHub

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

Jump to bottom

Fix Line2D joints with joint_mode set to Round rendered "flipped" for a 180 degree angle. #90786

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Fix Line2D joints with joint_mode set to Round rendered "flipped" for a 180 degree angle. #90786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion scene/2d/line_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,20 @@ void LineBuilder::build() {
} else if (current_joint_mode == Line2D::LINE_JOINT_ROUND && !(wrap_around && i == segments_count)) {
Vector2 vbegin = cbegin - pos1;
Vector2 vend = cend - pos1;
strip_add_arc(pos1, vbegin.angle_to(vend), orientation);
// We want to use vbegin.angle_to(vend) below, which evaluates to
// Math::atan2(vbegin.cross(vend), vbegin.dot(vend)) but we need to
// calculate this ourselves as we need to check if the cross product
// in that calculation ends up being -0.f and flip it if so, effectively
// flipping the resulting angle_delta to not return -PI but +PI instead
float cross_product = vbegin.cross(vend);
float dot_product = vbegin.dot(vend);
// Note that we're comparing against -0.f for clarity but 0.f would
// match as well, therefore we need the explicit signbit check too.
if (cross_product == -0.f && signbit(cross_product)) {
cross_product = 0.f;
}
float angle_delta = Math::atan2(cross_product, dot_product);
strip_add_arc(pos1, angle_delta, orientation);
}

if (!is_intersecting) {
Expand Down
Loading