Add Rect::scale_from_center
#4673
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
murl-digital
approved these changes
Jun 19, 2024
emilk
reviewed
Jul 15, 2024
crates/emath/src/rect.rs
Outdated
Comment on lines
194
to
202
| /// Scale up by this factor in each direction, keeping the center | ||
| #[must_use] | ||
| pub fn scale(self, amnt: f32) -> Self { | ||
| self.scale2(Vec2::splat(amnt)) | ||
| } | ||
|
|
||
| /// Scale up by this factor in each direction, keeping the center | ||
| #[must_use] | ||
| pub fn scale2(self, scale: Vec2) -> Self { |
There was a problem hiding this comment.
I think these should be called scale_from_center[2], or take an Align2 to specify which corner is the fixpoint
There was a problem hiding this comment.
Renamed to scale_from_center. I don't think taking an Align2 would be particularly useful (I can't think of a use case for wanting to scale up around non-center?), but I might be wrong on that.
emilk
approved these changes
Jul 15, 2024
emilk
changed the title
scale and scale2 to RectsRect:: scale_from_center
|
Sweet, thanks man! |
lucasmerlin
pushed a commit
to lucasmerlin/egui
that referenced
this pull request
Jul 30, 2024
<!-- Please read the "Making a PR" section of [`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md) before opening a Pull Request! * Keep your PR:s small and focused. * The PR title is what ends up in the changelog, so make it descriptive! * If applicable, add a screenshot or gif. * If it is a non-trivial addition, consider adding a demo for it to `egui_demo_lib`, or a new example. * Do NOT open PR:s from your `master` branch, as that makes it hard for maintainers to add commits to your PR. * Remember to run `cargo fmt` and `cargo clippy`. * Open the PR as a draft until you have self-reviewed it and run `./scripts/check.sh`. * When you have addressed a PR comment, mark it as resolved. Please be patient! I will review your PR, but my time is limited! --> I find myself wanting this API quite a lot, and I imagine it'll probably be useful for others. # What? This PR adds `Rect::scale` and `Rect::scale2` functions, which work a lot like `expand`, but instead multiply by a scale. i.e. ```rs rect.scale(2.0); // rect is 2x as big, still in same center rect.scale2(vec2(1.5, 2.0)); // rect is 1.5x as big on x axis, 2.0x as big on y axis. still in same center ``` # Why? Before this you either had to write this yourself or use a `expand` in a cumbersome way: ```rs rect.expand2(vec2(rect.width() * scale.x / 2.0, rect.height() * scale.y / 2.0)); ``` I find myself wanting to scale things up by a factor frequently enough, and it seems like a useful addition to have a multiply-based variant of `expand`. I realise this is pretty minor, but it seems useful enough to me! --------- Co-authored-by: zkldi <[email protected]> Co-authored-by: Emil Ernerfeldt <[email protected]>
486c
pushed a commit
to 486c/egui
that referenced
this pull request
Oct 9, 2024
<!-- Please read the "Making a PR" section of [`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md) before opening a Pull Request! * Keep your PR:s small and focused. * The PR title is what ends up in the changelog, so make it descriptive! * If applicable, add a screenshot or gif. * If it is a non-trivial addition, consider adding a demo for it to `egui_demo_lib`, or a new example. * Do NOT open PR:s from your `master` branch, as that makes it hard for maintainers to add commits to your PR. * Remember to run `cargo fmt` and `cargo clippy`. * Open the PR as a draft until you have self-reviewed it and run `./scripts/check.sh`. * When you have addressed a PR comment, mark it as resolved. Please be patient! I will review your PR, but my time is limited! --> I find myself wanting this API quite a lot, and I imagine it'll probably be useful for others. # What? This PR adds `Rect::scale` and `Rect::scale2` functions, which work a lot like `expand`, but instead multiply by a scale. i.e. ```rs rect.scale(2.0); // rect is 2x as big, still in same center rect.scale2(vec2(1.5, 2.0)); // rect is 1.5x as big on x axis, 2.0x as big on y axis. still in same center ``` # Why? Before this you either had to write this yourself or use a `expand` in a cumbersome way: ```rs rect.expand2(vec2(rect.width() * scale.x / 2.0, rect.height() * scale.y / 2.0)); ``` I find myself wanting to scale things up by a factor frequently enough, and it seems like a useful addition to have a multiply-based variant of `expand`. I realise this is pretty minor, but it seems useful enough to me! --------- Co-authored-by: zkldi <[email protected]> Co-authored-by: Emil Ernerfeldt <[email protected]>
hacknus
pushed a commit
to hacknus/egui
that referenced
this pull request
Oct 30, 2024
<!-- Please read the "Making a PR" section of [`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md) before opening a Pull Request! * Keep your PR:s small and focused. * The PR title is what ends up in the changelog, so make it descriptive! * If applicable, add a screenshot or gif. * If it is a non-trivial addition, consider adding a demo for it to `egui_demo_lib`, or a new example. * Do NOT open PR:s from your `master` branch, as that makes it hard for maintainers to add commits to your PR. * Remember to run `cargo fmt` and `cargo clippy`. * Open the PR as a draft until you have self-reviewed it and run `./scripts/check.sh`. * When you have addressed a PR comment, mark it as resolved. Please be patient! I will review your PR, but my time is limited! --> I find myself wanting this API quite a lot, and I imagine it'll probably be useful for others. # What? This PR adds `Rect::scale` and `Rect::scale2` functions, which work a lot like `expand`, but instead multiply by a scale. i.e. ```rs rect.scale(2.0); // rect is 2x as big, still in same center rect.scale2(vec2(1.5, 2.0)); // rect is 1.5x as big on x axis, 2.0x as big on y axis. still in same center ``` # Why? Before this you either had to write this yourself or use a `expand` in a cumbersome way: ```rs rect.expand2(vec2(rect.width() * scale.x / 2.0, rect.height() * scale.y / 2.0)); ``` I find myself wanting to scale things up by a factor frequently enough, and it seems like a useful addition to have a multiply-based variant of `expand`. I realise this is pretty minor, but it seems useful enough to me! --------- Co-authored-by: zkldi <[email protected]> Co-authored-by: Emil Ernerfeldt <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I find myself wanting this API quite a lot, and I imagine it'll probably be useful for others.
What?
This PR adds
Rect::scaleandRect::scale2functions, which work a lot likeexpand, but instead multiply by a scale.i.e.
Why?
Before this you either had to write this yourself or use a
expandin a cumbersome way:I find myself wanting to scale things up by a factor frequently enough, and it seems like a useful addition to have a multiply-based variant of
expand.I realise this is pretty minor, but it seems useful enough to me!