Changed (Vec2, Vec2) to Rect in Camera::logical_viewport_rect

[s-lambert]

Objective

Camera::logical_viewport_rect() returns Option<(Vec2, Vec2)> which is a tuple of vectors representing the (min, max) bounds of the viewport rect. Since the function says it returns a rect and there is a Rect { min, max } struct in bevy_math, using the struct will be clearer.

Solution

Replaced Option<(Vec2, Vec2)> with Option<Rect> for Camera::logical_viewport_rect().

---

Changelog

• Changed Camera::logical_viewport_rect return type from (Vec2, Vec2) to Rect

Migration Guide

Before:

fn view_logical_camera_rect(camera_query: Query<&Camera>) {
    let camera = camera_query.single();
    let Some((min, max)) = camera.logical_viewport_rect() else { return };
    dbg!(min, max);
}

After:

fn view_logical_camera_rect(camera_query: Query<&Camera>) {
    let camera = camera_query.single();
    let Some(Rect { min, max }) = camera.logical_viewport_rect() else { return };
    dbg!(min, max);
}

[github-actions]

Welcome, new contributor!

Please make sure you've read our contributing guide and we look forward to reviewing your pull request shortly ✨

[mockersf]

Could you also change physical_viewport_rect?

[s-lambert]

Could you also change physical_viewport_rect?

I had a look at that but since there's no Rect equivalent for UVec2 I wasn't confident in changing it. I'm not sure where to put the URect struct too, this is the only place that uses a (UVec2, UVec2).

[james7132]

I had a look at that but since there's no Rect equivalent for UVec2 I wasn't confident in changing it. I'm not sure where to put the URect struct too, this is the only place that uses a (UVec2, UVec2).

Seems like a good case for a URect type of some kind. Not going to block on this though.

[alice-i-cecile]

@s-lambert CI seems to be failing to detect the right settings. Can you please rebase your PR or merge main into your branch?

[s-lambert]

@s-lambert CI seems to be failing to detect the right settings. Can you please rebase your PR or merge main into your branch?

Done 👍, rebased on latest main.