Rename Rect inset() method to inflate() (#13452)

# Objective

- Fixes #13092.

## Solution

- Renamed the `inset()` method in `Rect`, `IRect` and `URect` to
`inflate()`.
- Added `EMPTY` constants to all `Rect` variants, represented by corners
with the maximum numerical values for each kind.

---

## Migration Guide

- Replace `Rect::inset()`, `IRect::inset()` and `URect::inset()` calls
with `inflate()`.
This commit is contained in:
Martín Maita 2024-05-21 22:53:55 +02:00 committed by GitHub
parent 5a1c62faae
commit f9da5eecf2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 54 additions and 36 deletions

View file

@ -19,6 +19,12 @@ pub struct IRect {
} }
impl IRect { impl IRect {
/// An empty `IRect`, represented by maximum and minimum corner points
/// with all `i32::MAX` values.
pub const EMPTY: Self = Self {
max: IVec2::MAX,
min: IVec2::MAX,
};
/// Create a new rectangle from two corner points. /// Create a new rectangle from two corner points.
/// ///
/// The two points do not need to be the minimum and/or maximum corners. /// The two points do not need to be the minimum and/or maximum corners.
@ -289,31 +295,31 @@ impl IRect {
r r
} }
/// Create a new rectangle with a constant inset. /// Create a new rectangle by expanding it evenly on all sides.
/// ///
/// The inset is the extra border on all sides. A positive inset produces a larger rectangle, /// A positive expansion value produces a larger rectangle,
/// while a negative inset is allowed and produces a smaller rectangle. If the inset is negative /// while a negative expansion value produces a smaller rectangle.
/// and its absolute value is larger than the rectangle half-size, the created rectangle is empty. /// If this would result in zero or negative width or height, [`IRect::EMPTY`] is returned instead.
/// ///
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// # use bevy_math::{IRect, IVec2}; /// # use bevy_math::{IRect, IVec2};
/// let r = IRect::new(0, 0, 5, 1); // w=5 h=1 /// let r = IRect::new(0, 0, 5, 1); // w=5 h=1
/// let r2 = r.inset(3); // w=11 h=7 /// let r2 = r.inflate(3); // w=11 h=7
/// assert_eq!(r2.min, IVec2::splat(-3)); /// assert_eq!(r2.min, IVec2::splat(-3));
/// assert_eq!(r2.max, IVec2::new(8, 4)); /// assert_eq!(r2.max, IVec2::new(8, 4));
/// ///
/// let r = IRect::new(0, -1, 4, 3); // w=4 h=4 /// let r = IRect::new(0, -1, 4, 3); // w=4 h=4
/// let r2 = r.inset(-1); // w=2 h=2 /// let r2 = r.inflate(-1); // w=2 h=2
/// assert_eq!(r2.min, IVec2::new(1, 0)); /// assert_eq!(r2.min, IVec2::new(1, 0));
/// assert_eq!(r2.max, IVec2::new(3, 2)); /// assert_eq!(r2.max, IVec2::new(3, 2));
/// ``` /// ```
#[inline] #[inline]
pub fn inset(&self, inset: i32) -> Self { pub fn inflate(&self, expansion: i32) -> Self {
let mut r = Self { let mut r = Self {
min: self.min - inset, min: self.min - expansion,
max: self.max + inset, max: self.max + expansion,
}; };
// Collapse min over max to enforce invariants and ensure e.g. width() or // Collapse min over max to enforce invariants and ensure e.g. width() or
// height() never return a negative value. // height() never return a negative value.
@ -448,10 +454,10 @@ mod tests {
} }
#[test] #[test]
fn rect_inset() { fn rect_inflate() {
let r = IRect::from_center_size(IVec2::ZERO, IVec2::splat(4)); // [-2,-2] - [2,2] let r = IRect::from_center_size(IVec2::ZERO, IVec2::splat(4)); // [-2,-2] - [2,2]
let r2 = r.inset(2); let r2 = r.inflate(2);
assert_eq!(r2.min, IVec2::new(-4, -4)); assert_eq!(r2.min, IVec2::new(-4, -4));
assert_eq!(r2.max, IVec2::new(4, 4)); assert_eq!(r2.max, IVec2::new(4, 4));
} }

View file

@ -19,6 +19,12 @@ pub struct Rect {
} }
impl Rect { impl Rect {
/// An empty `Rect`, represented by maximum and minimum corner points
/// with all `f32::MAX` values.
pub const EMPTY: Self = Self {
max: Vec2::MAX,
min: Vec2::MAX,
};
/// Create a new rectangle from two corner points. /// Create a new rectangle from two corner points.
/// ///
/// The two points do not need to be the minimum and/or maximum corners. /// The two points do not need to be the minimum and/or maximum corners.
@ -277,31 +283,31 @@ impl Rect {
r r
} }
/// Create a new rectangle with a constant inset. /// Create a new rectangle by expanding it evenly on all sides.
/// ///
/// The inset is the extra border on all sides. A positive inset produces a larger rectangle, /// A positive expansion value produces a larger rectangle,
/// while a negative inset is allowed and produces a smaller rectangle. If the inset is negative /// while a negative expansion value produces a smaller rectangle.
/// and its absolute value is larger than the rectangle half-size, the created rectangle is empty. /// If this would result in zero or negative width or height, [`Rect::EMPTY`] is returned instead.
/// ///
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// # use bevy_math::{Rect, Vec2}; /// # use bevy_math::{Rect, Vec2};
/// let r = Rect::new(0., 0., 5., 1.); // w=5 h=1 /// let r = Rect::new(0., 0., 5., 1.); // w=5 h=1
/// let r2 = r.inset(3.); // w=11 h=7 /// let r2 = r.inflate(3.); // w=11 h=7
/// assert!(r2.min.abs_diff_eq(Vec2::splat(-3.), 1e-5)); /// assert!(r2.min.abs_diff_eq(Vec2::splat(-3.), 1e-5));
/// assert!(r2.max.abs_diff_eq(Vec2::new(8., 4.), 1e-5)); /// assert!(r2.max.abs_diff_eq(Vec2::new(8., 4.), 1e-5));
/// ///
/// let r = Rect::new(0., -1., 6., 7.); // w=6 h=8 /// let r = Rect::new(0., -1., 6., 7.); // w=6 h=8
/// let r2 = r.inset(-2.); // w=11 h=7 /// let r2 = r.inflate(-2.); // w=11 h=7
/// assert!(r2.min.abs_diff_eq(Vec2::new(2., 1.), 1e-5)); /// assert!(r2.min.abs_diff_eq(Vec2::new(2., 1.), 1e-5));
/// assert!(r2.max.abs_diff_eq(Vec2::new(4., 5.), 1e-5)); /// assert!(r2.max.abs_diff_eq(Vec2::new(4., 5.), 1e-5));
/// ``` /// ```
#[inline] #[inline]
pub fn inset(&self, inset: f32) -> Self { pub fn inflate(&self, expansion: f32) -> Self {
let mut r = Self { let mut r = Self {
min: self.min - inset, min: self.min - expansion,
max: self.max + inset, max: self.max + expansion,
}; };
// Collapse min over max to enforce invariants and ensure e.g. width() or // Collapse min over max to enforce invariants and ensure e.g. width() or
// height() never return a negative value. // height() never return a negative value.
@ -460,10 +466,10 @@ mod tests {
} }
#[test] #[test]
fn rect_inset() { fn rect_inflate() {
let r = Rect::from_center_size(Vec2::ZERO, Vec2::ONE); // [-0.5,-0.5] - [0.5,0.5] let r = Rect::from_center_size(Vec2::ZERO, Vec2::ONE); // [-0.5,-0.5] - [0.5,0.5]
let r2 = r.inset(0.3); let r2 = r.inflate(0.3);
assert!(r2.min.abs_diff_eq(Vec2::new(-0.8, -0.8), 1e-5)); assert!(r2.min.abs_diff_eq(Vec2::new(-0.8, -0.8), 1e-5));
assert!(r2.max.abs_diff_eq(Vec2::new(0.8, 0.8), 1e-5)); assert!(r2.max.abs_diff_eq(Vec2::new(0.8, 0.8), 1e-5));
} }

View file

@ -19,6 +19,12 @@ pub struct URect {
} }
impl URect { impl URect {
/// An empty `URect`, represented by maximum and minimum corner points
/// with all `u32::MAX` values.
pub const EMPTY: Self = Self {
max: UVec2::MAX,
min: UVec2::MAX,
};
/// Create a new rectangle from two corner points. /// Create a new rectangle from two corner points.
/// ///
/// The two points do not need to be the minimum and/or maximum corners. /// The two points do not need to be the minimum and/or maximum corners.
@ -286,36 +292,36 @@ impl URect {
r r
} }
/// Create a new rectangle with a constant inset. /// Create a new rectangle by expanding it evenly on all sides.
/// ///
/// The inset is the extra border on all sides. A positive inset produces a larger rectangle, /// A positive expansion value produces a larger rectangle,
/// while a negative inset is allowed and produces a smaller rectangle. If the inset is negative /// while a negative expansion value produces a smaller rectangle.
/// and its absolute value is larger than the rectangle half-size, the created rectangle is empty. /// If this would result in zero width or height, [`URect::EMPTY`] is returned instead.
/// ///
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// # use bevy_math::{URect, UVec2}; /// # use bevy_math::{URect, UVec2};
/// let r = URect::new(4, 4, 6, 6); // w=2 h=2 /// let r = URect::new(4, 4, 6, 6); // w=2 h=2
/// let r2 = r.inset(1); // w=4 h=4 /// let r2 = r.inflate(1); // w=4 h=4
/// assert_eq!(r2.min, UVec2::splat(3)); /// assert_eq!(r2.min, UVec2::splat(3));
/// assert_eq!(r2.max, UVec2::splat(7)); /// assert_eq!(r2.max, UVec2::splat(7));
/// ///
/// let r = URect::new(4, 4, 8, 8); // w=4 h=4 /// let r = URect::new(4, 4, 8, 8); // w=4 h=4
/// let r2 = r.inset(-1); // w=2 h=2 /// let r2 = r.inflate(-1); // w=2 h=2
/// assert_eq!(r2.min, UVec2::splat(5)); /// assert_eq!(r2.min, UVec2::splat(5));
/// assert_eq!(r2.max, UVec2::splat(7)); /// assert_eq!(r2.max, UVec2::splat(7));
/// ``` /// ```
#[inline] #[inline]
pub fn inset(&self, inset: i32) -> Self { pub fn inflate(&self, expansion: i32) -> Self {
let mut r = Self { let mut r = Self {
min: UVec2::new( min: UVec2::new(
self.min.x.saturating_add_signed(-inset), self.min.x.saturating_add_signed(-expansion),
self.min.y.saturating_add_signed(-inset), self.min.y.saturating_add_signed(-expansion),
), ),
max: UVec2::new( max: UVec2::new(
self.max.x.saturating_add_signed(inset), self.max.x.saturating_add_signed(expansion),
self.max.y.saturating_add_signed(inset), self.max.y.saturating_add_signed(expansion),
), ),
}; };
// Collapse min over max to enforce invariants and ensure e.g. width() or // Collapse min over max to enforce invariants and ensure e.g. width() or
@ -451,10 +457,10 @@ mod tests {
} }
#[test] #[test]
fn rect_inset() { fn rect_inflate() {
let r = URect::from_center_size(UVec2::splat(6), UVec2::splat(6)); // [3, 3] - [9, 9] let r = URect::from_center_size(UVec2::splat(6), UVec2::splat(6)); // [3, 3] - [9, 9]
let r2 = r.inset(2); let r2 = r.inflate(2);
assert_eq!(r2.min, UVec2::new(1, 1)); assert_eq!(r2.min, UVec2::new(1, 1));
assert_eq!(r2.max, UVec2::new(11, 11)); assert_eq!(r2.max, UVec2::new(11, 11));
} }

View file

@ -581,7 +581,7 @@ pub fn extract_uinode_outlines(
// Calculate the outline rects. // Calculate the outline rects.
let inner_rect = Rect::from_center_size(Vec2::ZERO, node.size() + 2. * node.outline_offset); let inner_rect = Rect::from_center_size(Vec2::ZERO, node.size() + 2. * node.outline_offset);
let outer_rect = inner_rect.inset(node.outline_width()); let outer_rect = inner_rect.inflate(node.outline_width());
let outline_edges = [ let outline_edges = [
// Left edge // Left edge
Rect::new( Rect::new(