From 9bb474d2ea818fdf74a7080ef958dd50fd285bec Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Mon, 13 Nov 2023 21:59:34 -0500
Subject: [PATCH 01/17] Add gizmo arrows!

---
 crates/bevy_gizmos/src/arrows.rs | 57 ++++++++++++++++++++++++++++++++
 crates/bevy_gizmos/src/lib.rs    |  1 +
 2 files changed, 58 insertions(+)
 create mode 100644 crates/bevy_gizmos/src/arrows.rs

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
new file mode 100644
index 0000000000000..3019f4cc98371
--- /dev/null
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -0,0 +1,57 @@
+//! Additional Gizmo Functions -- Arrows
+
+use crate::prelude::Gizmos;
+use bevy_math::{Quat, Vec2, Vec3};
+use bevy_render::color::Color;
+
+pub struct ArrowBuilder<'a, 's> {
+    gizmos: &'a mut Gizmos<'s>,
+    start: Vec3,
+    end: Vec3,
+    color: Color,
+    tip_length: f32,
+}
+
+impl Drop for ArrowBuilder<'_, '_> {
+    fn drop(&mut self) {
+        // draw the body of the arrow
+        self.gizmos.line(self.start, self.end, self.color);
+        // now the hard part is to draw the head in a sensible way
+        // put us in a coordinate system where the arrow is pointing up and ends at the origin
+        let pointing = (self.end - self.start).normalize();
+        let rotation = Quat::from_rotation_arc(Vec3::X, pointing);
+        let tips = [(1, 0), (0, 1), (-1, 0), (0, -1)]
+            .into_iter()
+            .map(|(y, z)| Vec3 {
+                x: -1.,
+                y: y as f32,
+                z: z as f32,
+            })
+            .map(|v| v * self.tip_length)
+            .map(|v| rotation.mul_vec3(v))
+            .map(|v| v + self.end);
+        for v in tips {
+            self.gizmos.line(self.end, v, self.color);
+        }
+    }
+}
+
+impl<'s> Gizmos<'s> {
+    /// draw an arrow.
+    pub fn arrow(&mut self, start: Vec3, end: Vec3, color: Color) -> ArrowBuilder<'_, 's> {
+        // self.line_2d(start, end, color);
+        let length = (end - start).length();
+        ArrowBuilder {
+            gizmos: self,
+            start,
+            end,
+            color,
+            tip_length: length / 10.,
+        }
+    }
+
+    /// draw an arrow in 2d space, on the x-y plane.
+    pub fn arrow_2d(&mut self, start: Vec2, end: Vec2, color: Color) -> ArrowBuilder<'_, 's> {
+        self.arrow(start.extend(0.), end.extend(0.), color)
+    }
+}
diff --git a/crates/bevy_gizmos/src/lib.rs b/crates/bevy_gizmos/src/lib.rs
index 333d8e2e9bbc7..5ad9d8934db06 100644
--- a/crates/bevy_gizmos/src/lib.rs
+++ b/crates/bevy_gizmos/src/lib.rs
@@ -16,6 +16,7 @@
 //!
 //! See the documentation on [`Gizmos`] for more examples.
 
+mod arrows;
 pub mod gizmos;
 
 #[cfg(feature = "bevy_sprite")]

From 839e3bfcf24956540e504db4b673ca068cd84cbb Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Mon, 13 Nov 2023 22:00:34 -0500
Subject: [PATCH 02/17] add an arrow to to 3d_gizmos example

---
 examples/3d/3d_gizmos.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/3d/3d_gizmos.rs b/examples/3d/3d_gizmos.rs
index 8f6e1cb2d1373..14f4b3946450f 100644
--- a/examples/3d/3d_gizmos.rs
+++ b/examples/3d/3d_gizmos.rs
@@ -96,6 +96,8 @@ fn system(mut gizmos: Gizmos, time: Res<Time>) {
     gizmos
         .sphere(Vec3::ZERO, Quat::IDENTITY, 3.2, Color::BLACK)
         .circle_segments(64);
+
+    gizmos.arrow(Vec3::ZERO, Vec3::ONE * 1.5, Color::YELLOW);
 }
 
 fn rotate_camera(mut query: Query<&mut Transform, With<Camera>>, time: Res<Time>) {

From 05057e1290aebd14516145af06308b50f70141f3 Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Mon, 13 Nov 2023 22:06:43 -0500
Subject: [PATCH 03/17] add an arrow to 2d example

---
 examples/2d/2d_gizmos.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/examples/2d/2d_gizmos.rs b/examples/2d/2d_gizmos.rs
index 59efe0ab75aed..a5aadbb2ade7d 100644
--- a/examples/2d/2d_gizmos.rs
+++ b/examples/2d/2d_gizmos.rs
@@ -53,6 +53,12 @@ fn system(mut gizmos: Gizmos, time: Res<Time>) {
     // Arcs default amount of segments is linearly interpolated between
     // 1 and 32, using the arc length as scalar.
     gizmos.arc_2d(Vec2::ZERO, sin / 10., PI / 2., 350., Color::ORANGE_RED);
+
+    gizmos.arrow_2d(
+        Vec2::ZERO,
+        Vec2::from_angle(sin / -10. + PI / 2.) * 50.,
+        Color::YELLOW,
+    );
 }
 
 fn update_config(mut config: ResMut<GizmoConfig>, keyboard: Res<Input<KeyCode>>, time: Res<Time>) {

From 38a9462fac82eb9acc15a5fbae553ee43ddff2a5 Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Mon, 13 Nov 2023 22:22:01 -0500
Subject: [PATCH 04/17] add docs and doctests to arrow and arrow_2d

---
 crates/bevy_gizmos/src/arrows.rs | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index 3019f4cc98371..3709c01158029 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -37,7 +37,20 @@ impl Drop for ArrowBuilder<'_, '_> {
 }
 
 impl<'s> Gizmos<'s> {
-    /// draw an arrow.
+    /// Draw an arrow in 3D, from `start` to `end`. Has four tips for convienent viewing from any direction.
+    ///
+    /// This should be called for each frame the arrow needs to be rendered.
+    ///
+    /// # example
+    /// ```
+    /// # use bevy_gizmos::prelude::*;
+    /// # use bevy_render::prelude::*;
+    /// # use bevy_math::prelude::*;
+    /// fn system(mut gizmos: Gizmos) {
+    ///     gizmos.arrow(Vec3::ZERO, Vec3::ONE, Color::GREEN);
+    /// }
+    /// # bevy_ecs::system::assert_is_system(system);
+    /// ```
     pub fn arrow(&mut self, start: Vec3, end: Vec3, color: Color) -> ArrowBuilder<'_, 's> {
         // self.line_2d(start, end, color);
         let length = (end - start).length();
@@ -50,7 +63,20 @@ impl<'s> Gizmos<'s> {
         }
     }
 
-    /// draw an arrow in 2d space, on the x-y plane.
+    /// Draw an arrow in 2D (on the xy plane), from `start` to `end`.
+    ///
+    /// This should be called for each frame the arrow needs to be rendered.
+    ///
+    /// # example
+    /// ```
+    /// # use bevy_gizmos::prelude::*;
+    /// # use bevy_render::prelude::*;
+    /// # use bevy_math::prelude::*;
+    /// fn system(mut gizmos: Gizmos) {
+    ///     gizmos.arrow_2d(Vec2::ZERO, Vec2::X, Color::GREEN);
+    /// }
+    /// # bevy_ecs::system::assert_is_system(system);
+    /// ```
     pub fn arrow_2d(&mut self, start: Vec2, end: Vec2, color: Color) -> ArrowBuilder<'_, 's> {
         self.arrow(start.extend(0.), end.extend(0.), color)
     }

From b14575521bf05b323282ebc19c9446deb92530ed Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Mon, 13 Nov 2023 22:27:17 -0500
Subject: [PATCH 05/17] update comment inside ArrowBuilder.drop

---
 crates/bevy_gizmos/src/arrows.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index 3709c01158029..145487fb6e718 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -17,7 +17,8 @@ impl Drop for ArrowBuilder<'_, '_> {
         // draw the body of the arrow
         self.gizmos.line(self.start, self.end, self.color);
         // now the hard part is to draw the head in a sensible way
-        // put us in a coordinate system where the arrow is pointing up and ends at the origin
+        // put us in a coordinate system where the arrow is pointing towards +x and ends at the origin
+        // then transform it so we're at the end of the arrow facing the right direction
         let pointing = (self.end - self.start).normalize();
         let rotation = Quat::from_rotation_arc(Vec3::X, pointing);
         let tips = [(1, 0), (0, 1), (-1, 0), (0, -1)]

From a1147cbbba3555c76a882ade7a7f39ea7019a9d6 Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Mon, 13 Nov 2023 22:43:21 -0500
Subject: [PATCH 06/17] add ArrowBuilder.with_tip_length and it's docs

---
 crates/bevy_gizmos/src/arrows.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index 145487fb6e718..244f27b202825 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -12,7 +12,28 @@ pub struct ArrowBuilder<'a, 's> {
     tip_length: f32,
 }
 
+impl ArrowBuilder<'_, '_> {
+    /// Change the length of the tips to be `length`.
+    /// The default tip length is [length of the arrow]/10, which is sufficient for most applications.
+    ///
+    /// # example
+    /// ```
+    /// # use bevy_gizmos::prelude::*;
+    /// # use bevy_render::prelude::*;
+    /// # use bevy_math::prelude::*;
+    /// fn system(mut gizmos: Gizmos) {
+    ///     gizmos.arrow(Vec3::ZERO, Vec3::ONE, Color::GREEN)
+    ///         .with_tip_length(3.);
+    /// }
+    /// # bevy_ecs::system::assert_is_system(system);
+    /// ```
+    pub fn with_tip_length(&mut self, length: f32) {
+        self.tip_length = length;
+    }
+}
+
 impl Drop for ArrowBuilder<'_, '_> {
+    /// actually draws the
     fn drop(&mut self) {
         // draw the body of the arrow
         self.gizmos.line(self.start, self.end, self.color);

From 2a14edda221c85f16a14476a87339ea46267a25d Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Mon, 13 Nov 2023 22:45:19 -0500
Subject: [PATCH 07/17] add doc comment to ArrowBuilder

---
 crates/bevy_gizmos/src/arrows.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index 244f27b202825..e868e87ba6c65 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -12,6 +12,7 @@ pub struct ArrowBuilder<'a, 's> {
     tip_length: f32,
 }
 
+/// A builder returned by [`Gizmos::arrow`] and [`Gizmos::arrow_2d`]
 impl ArrowBuilder<'_, '_> {
     /// Change the length of the tips to be `length`.
     /// The default tip length is [length of the arrow]/10, which is sufficient for most applications.

From 26d0d311589a46e266872a026a7a041a97836ea3 Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Mon, 13 Nov 2023 22:46:28 -0500
Subject: [PATCH 08/17] finish writing doc comment on ArrowBuilder.drop

---
 crates/bevy_gizmos/src/arrows.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index e868e87ba6c65..5c149c524b9fb 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -34,7 +34,7 @@ impl ArrowBuilder<'_, '_> {
 }
 
 impl Drop for ArrowBuilder<'_, '_> {
-    /// actually draws the
+    /// actually draws the arrow, by drawing lines with the stored [`Gizmos`]
     fn drop(&mut self) {
         // draw the body of the arrow
         self.gizmos.line(self.start, self.end, self.color);

From 75e7752247c58a18333309920ccb3f9aa0d038f3 Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Tue, 14 Nov 2023 08:40:21 -0500
Subject: [PATCH 09/17] add arrow_head_length alias to with_tip_length

suggested by @nicopap

Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
---
 crates/bevy_gizmos/src/arrows.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index 5c149c524b9fb..dce1cc404b960 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -28,6 +28,7 @@ impl ArrowBuilder<'_, '_> {
     /// }
     /// # bevy_ecs::system::assert_is_system(system);
     /// ```
+    #[doc(alias = "arrow_head_length")]
     pub fn with_tip_length(&mut self, length: f32) {
         self.tip_length = length;
     }

From a93dc950948cfbcf3df17d8995d5a877aaf24244 Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Tue, 14 Nov 2023 08:45:24 -0500
Subject: [PATCH 10/17] make the comment on ArrowBuilder.drop a bit more
 professional

Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
---
 crates/bevy_gizmos/src/arrows.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index dce1cc404b960..dfa39042138ea 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -35,7 +35,7 @@ impl ArrowBuilder<'_, '_> {
 }
 
 impl Drop for ArrowBuilder<'_, '_> {
-    /// actually draws the arrow, by drawing lines with the stored [`Gizmos`]
+    /// Draws the arrow, by drawing lines with the stored [`Gizmos`]
     fn drop(&mut self) {
         // draw the body of the arrow
         self.gizmos.line(self.start, self.end, self.color);

From dba55c8144fc0fc52088cb5a16177f9e8c7f458f Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Tue, 14 Nov 2023 08:51:11 -0500
Subject: [PATCH 11/17] capitalize "Example" in three places

Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
---
 crates/bevy_gizmos/src/arrows.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index dfa39042138ea..80758069862e4 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -17,7 +17,7 @@ impl ArrowBuilder<'_, '_> {
     /// Change the length of the tips to be `length`.
     /// The default tip length is [length of the arrow]/10, which is sufficient for most applications.
     ///
-    /// # example
+    /// # Example
     /// ```
     /// # use bevy_gizmos::prelude::*;
     /// # use bevy_render::prelude::*;
@@ -65,7 +65,7 @@ impl<'s> Gizmos<'s> {
     ///
     /// This should be called for each frame the arrow needs to be rendered.
     ///
-    /// # example
+    /// # Example
     /// ```
     /// # use bevy_gizmos::prelude::*;
     /// # use bevy_render::prelude::*;
@@ -91,7 +91,7 @@ impl<'s> Gizmos<'s> {
     ///
     /// This should be called for each frame the arrow needs to be rendered.
     ///
-    /// # example
+    /// # Example
     /// ```
     /// # use bevy_gizmos::prelude::*;
     /// # use bevy_render::prelude::*;

From d177593854e73f3e44e78a841b0655e9b23488b0 Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Tue, 14 Nov 2023 08:54:46 -0500
Subject: [PATCH 12/17] Remove commented out dev code

Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
---
 crates/bevy_gizmos/src/arrows.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index 80758069862e4..5f0c361e730ab 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -76,7 +76,6 @@ impl<'s> Gizmos<'s> {
     /// # bevy_ecs::system::assert_is_system(system);
     /// ```
     pub fn arrow(&mut self, start: Vec3, end: Vec3, color: Color) -> ArrowBuilder<'_, 's> {
-        // self.line_2d(start, end, color);
         let length = (end - start).length();
         ArrowBuilder {
             gizmos: self,

From d1ac84837f309c82719d7ce5be7a96ed18fa520b Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Tue, 14 Nov 2023 10:45:14 -0500
Subject: [PATCH 13/17] Construct `tips` in a smarter way

Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
---
 crates/bevy_gizmos/src/arrows.rs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index 5f0c361e730ab..8f2ff0327883c 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -44,16 +44,13 @@ impl Drop for ArrowBuilder<'_, '_> {
         // then transform it so we're at the end of the arrow facing the right direction
         let pointing = (self.end - self.start).normalize();
         let rotation = Quat::from_rotation_arc(Vec3::X, pointing);
-        let tips = [(1, 0), (0, 1), (-1, 0), (0, -1)]
-            .into_iter()
-            .map(|(y, z)| Vec3 {
-                x: -1.,
-                y: y as f32,
-                z: z as f32,
-            })
-            .map(|v| v * self.tip_length)
-            .map(|v| rotation.mul_vec3(v))
-            .map(|v| v + self.end);
+let tips = [
+    Vec3::new(-1., 1., 0.),
+    Vec3::new(-1., 0., 1.),
+    Vec3::new(-1., -1., 0.),
+    Vec3::new(-1., 0., -1.),
+];
+let tips = tips.map(|v| rotation * (v * self.tip_length) + self.end);
         for v in tips {
             self.gizmos.line(self.end, v, self.color);
         }

From e1bde5a32c33c3d4fd89b2ab2effc80c04b7f2aa Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Tue, 14 Nov 2023 11:58:55 -0500
Subject: [PATCH 14/17] format arrows.rs

---
 crates/bevy_gizmos/src/arrows.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index 8f2ff0327883c..bde207bbd2a3b 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -44,13 +44,13 @@ impl Drop for ArrowBuilder<'_, '_> {
         // then transform it so we're at the end of the arrow facing the right direction
         let pointing = (self.end - self.start).normalize();
         let rotation = Quat::from_rotation_arc(Vec3::X, pointing);
-let tips = [
-    Vec3::new(-1., 1., 0.),
-    Vec3::new(-1., 0., 1.),
-    Vec3::new(-1., -1., 0.),
-    Vec3::new(-1., 0., -1.),
-];
-let tips = tips.map(|v| rotation * (v * self.tip_length) + self.end);
+        let tips = [
+            Vec3::new(-1., 1., 0.),
+            Vec3::new(-1., 0., 1.),
+            Vec3::new(-1., -1., 0.),
+            Vec3::new(-1., 0., -1.),
+        ];
+        let tips = tips.map(|v| rotation * (v * self.tip_length) + self.end);
         for v in tips {
             self.gizmos.line(self.end, v, self.color);
         }

From 9bc4cffc43f0377c2c8b2f6eb98b3ad2a8579810 Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Tue, 14 Nov 2023 12:13:21 -0500
Subject: [PATCH 15/17] update doc comment on ArrowBuilder.with_tip_length

remove "which is sufficient for most applications."

Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
---
 crates/bevy_gizmos/src/arrows.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index bde207bbd2a3b..175316d6ccb11 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -15,7 +15,7 @@ pub struct ArrowBuilder<'a, 's> {
 /// A builder returned by [`Gizmos::arrow`] and [`Gizmos::arrow_2d`]
 impl ArrowBuilder<'_, '_> {
     /// Change the length of the tips to be `length`.
-    /// The default tip length is [length of the arrow]/10, which is sufficient for most applications.
+    /// The default tip length is [length of the arrow]/10.
     ///
     /// # Example
     /// ```

From a5e68cc79586ec765e2421abd4feb6ffb1dabb6a Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Tue, 14 Nov 2023 12:16:19 -0500
Subject: [PATCH 16/17] Adjust comments inside ArrowBuilder.drop

---
 crates/bevy_gizmos/src/arrows.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index 175316d6ccb11..1a2757e8f4feb 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -37,11 +37,10 @@ impl ArrowBuilder<'_, '_> {
 impl Drop for ArrowBuilder<'_, '_> {
     /// Draws the arrow, by drawing lines with the stored [`Gizmos`]
     fn drop(&mut self) {
-        // draw the body of the arrow
+        // first, draw the body of the arrow
         self.gizmos.line(self.start, self.end, self.color);
         // now the hard part is to draw the head in a sensible way
         // put us in a coordinate system where the arrow is pointing towards +x and ends at the origin
-        // then transform it so we're at the end of the arrow facing the right direction
         let pointing = (self.end - self.start).normalize();
         let rotation = Quat::from_rotation_arc(Vec3::X, pointing);
         let tips = [
@@ -50,8 +49,12 @@ impl Drop for ArrowBuilder<'_, '_> {
             Vec3::new(-1., -1., 0.),
             Vec3::new(-1., 0., -1.),
         ];
+        // - extend the vectors so their length is `tip_length`
+        // - rotate the world so +x is facing in the same direction as the arrow
+        // - translate over to the tip of the arrow
         let tips = tips.map(|v| rotation * (v * self.tip_length) + self.end);
         for v in tips {
+            // then actually draw the tips
             self.gizmos.line(self.end, v, self.color);
         }
     }

From 583de5e123d4e171c5d81ffdd255f05862616547 Mon Sep 17 00:00:00 2001
From: Connor King <sigstackfault@gmail.com>
Date: Tue, 14 Nov 2023 12:32:21 -0500
Subject: [PATCH 17/17] normalize the tips before multiplying by `tip_length`

so their lenth is actually `tip_length` and not `sqrt(2)*tip_length`
---
 crates/bevy_gizmos/src/arrows.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs
index 1a2757e8f4feb..f15c88c6d5925 100644
--- a/crates/bevy_gizmos/src/arrows.rs
+++ b/crates/bevy_gizmos/src/arrows.rs
@@ -52,7 +52,7 @@ impl Drop for ArrowBuilder<'_, '_> {
         // - extend the vectors so their length is `tip_length`
         // - rotate the world so +x is facing in the same direction as the arrow
         // - translate over to the tip of the arrow
-        let tips = tips.map(|v| rotation * (v * self.tip_length) + self.end);
+        let tips = tips.map(|v| rotation * (v.normalize() * self.tip_length) + self.end);
         for v in tips {
             // then actually draw the tips
             self.gizmos.line(self.end, v, self.color);