From 2e234e16b20fc118d897175bc002bed9a29e9487 Mon Sep 17 00:00:00 2001 From: Multirious Date: Sat, 16 Mar 2024 19:15:48 +0700 Subject: [PATCH 1/3] Add methods to return the inner value for direction types Add `vec2` method for Dir2 Add `vec3` method for Dir3 Add `vec3a` method for Dir3A --- crates/bevy_math/src/direction.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/crates/bevy_math/src/direction.rs b/crates/bevy_math/src/direction.rs index c98736960c840..0bd78046ca7b0 100644 --- a/crates/bevy_math/src/direction.rs +++ b/crates/bevy_math/src/direction.rs @@ -136,6 +136,11 @@ impl Dir2 { pub fn from_xy(x: f32, y: f32) -> Result { Self::new(Vec2::new(x, y)) } + + /// Returning the inner [`Vec2`] + pub fn vec2(&self) -> Vec2 { + self.0 + } } impl TryFrom for Dir2 { @@ -287,6 +292,11 @@ impl Dir3 { pub fn from_xyz(x: f32, y: f32, z: f32) -> Result { Self::new(Vec3::new(x, y, z)) } + + /// Returning the inner [`Vec3`] + pub fn vec3(&self) -> Vec3 { + self.0 + } } impl TryFrom for Dir3 { @@ -447,6 +457,11 @@ impl Dir3A { pub fn from_xyz(x: f32, y: f32, z: f32) -> Result { Self::new(Vec3A::new(x, y, z)) } + + /// Returning the inner [`Vec3A`] + pub fn vec3a(&self) -> Vec3A { + self.0 + } } impl TryFrom for Dir3A { From fd699a3901f021dc748a3c1792ac7be7d1b6c8dc Mon Sep 17 00:00:00 2001 From: Multirious Date: Mon, 18 Mar 2024 20:16:14 +0700 Subject: [PATCH 2/3] Fix getters in direction types Renamed `Dir2::vec2` to `Dir2::to_vec2` Renamed `Dir3::vec3` to `Dir2::to_vec3` Renamed `Dir3A::vec3a` to `Dir2::to_vec3a` Make `Dir2::to_vec2` const Make `Dir2::to_vec3` const Make `Dir2::to_vec3a` const --- crates/bevy_math/src/direction.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/bevy_math/src/direction.rs b/crates/bevy_math/src/direction.rs index 0bd78046ca7b0..617a76998a6a0 100644 --- a/crates/bevy_math/src/direction.rs +++ b/crates/bevy_math/src/direction.rs @@ -137,8 +137,8 @@ impl Dir2 { Self::new(Vec2::new(x, y)) } - /// Returning the inner [`Vec2`] - pub fn vec2(&self) -> Vec2 { + /// Returns the inner [`Vec2`] + pub const fn to_vec2(&self) -> Vec2 { self.0 } } @@ -293,8 +293,8 @@ impl Dir3 { Self::new(Vec3::new(x, y, z)) } - /// Returning the inner [`Vec3`] - pub fn vec3(&self) -> Vec3 { + /// Returns the inner [`Vec3`] + pub const fn to_vec3(&self) -> Vec3 { self.0 } } @@ -458,8 +458,8 @@ impl Dir3A { Self::new(Vec3A::new(x, y, z)) } - /// Returning the inner [`Vec3A`] - pub fn vec3a(&self) -> Vec3A { + /// Returns the inner [`Vec3A`] + pub const fn to_vec3a(&self) -> Vec3A { self.0 } } From dd096ec40db93e9455953f2bd2c44ab952792952 Mon Sep 17 00:00:00 2001 From: Multirious Date: Mon, 18 Mar 2024 20:41:32 +0700 Subject: [PATCH 3/3] Rename getters for direction types Rename `Dir2::to_vec2` to `Dir2::as_vec2` Rename `Dir3::to_vec3` to `Dir3::as_vec3` Rename `Dir3A::to_vec3a` to `Dir3a::as_vec3a` --- crates/bevy_math/src/direction.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/bevy_math/src/direction.rs b/crates/bevy_math/src/direction.rs index 617a76998a6a0..a88d44b6024a4 100644 --- a/crates/bevy_math/src/direction.rs +++ b/crates/bevy_math/src/direction.rs @@ -138,7 +138,7 @@ impl Dir2 { } /// Returns the inner [`Vec2`] - pub const fn to_vec2(&self) -> Vec2 { + pub const fn as_vec2(&self) -> Vec2 { self.0 } } @@ -294,7 +294,7 @@ impl Dir3 { } /// Returns the inner [`Vec3`] - pub const fn to_vec3(&self) -> Vec3 { + pub const fn as_vec3(&self) -> Vec3 { self.0 } } @@ -459,7 +459,7 @@ impl Dir3A { } /// Returns the inner [`Vec3A`] - pub const fn to_vec3a(&self) -> Vec3A { + pub const fn as_vec3a(&self) -> Vec3A { self.0 } }