From 381f3d3fa5936f93bafff1cc2cae86f088d6d5f7 Mon Sep 17 00:00:00 2001 From: Robert Walter <26892280+RobWalt@users.noreply.github.com> Date: Mon, 5 Feb 2024 15:09:49 +0000 Subject: [PATCH] fix(primitives): fix polygon gizmo rendering bug (#11699) This is just a minor fix extracted from #11697 A logic error. We tried to close the polygon shape, if the user specifies an unclosed polygon. The closing linestring previously didn't close the polygon though, but instead added a zero length line at the last coordinate. Co-authored-by: Alice Cecile --- crates/bevy_gizmos/src/primitives/dim2.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/bevy_gizmos/src/primitives/dim2.rs b/crates/bevy_gizmos/src/primitives/dim2.rs index 7217be4e199fe..1922a9de6c932 100644 --- a/crates/bevy_gizmos/src/primitives/dim2.rs +++ b/crates/bevy_gizmos/src/primitives/dim2.rs @@ -467,9 +467,9 @@ impl<'w, 's, const N: usize, T: GizmoConfigGroup> GizmoPrimitive2d> // Check if the polygon needs a closing point let closing_point = { - let last = primitive.vertices.last(); - (primitive.vertices.first() != last) - .then_some(last) + let first = primitive.vertices.first(); + (primitive.vertices.last() != first) + .then_some(first) .flatten() .cloned() }; @@ -503,9 +503,9 @@ impl<'w, 's, T: GizmoConfigGroup> GizmoPrimitive2d for Gizmos<'w, } let closing_point = { - let last = primitive.vertices.last(); - (primitive.vertices.first() != last) - .then_some(last) + let first = primitive.vertices.first(); + (primitive.vertices.last() != first) + .then_some(first) .flatten() .cloned() };