Sort damage by distance from origin in iced_graphics::damage

This commit is contained in:
Héctor Ramón Jiménez 2024-04-10 20:23:07 +02:00
parent fdd9896dc5
commit 1e8554bf02
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 12 additions and 13 deletions

View file

@ -1,5 +1,5 @@
//! Compute the damage between frames.
use crate::core::Rectangle;
use crate::core::{Point, Rectangle};
/// Diffs the damage regions given some previous and current primitives.
pub fn diff<T>(
@ -50,9 +50,10 @@ pub fn group(mut damage: Vec<Rectangle>, bounds: Rectangle) -> Vec<Rectangle> {
const AREA_THRESHOLD: f32 = 20_000.0;
damage.sort_by(|a, b| {
a.x.partial_cmp(&b.x)
a.center()
.distance(Point::ORIGIN)
.partial_cmp(&b.center().distance(Point::ORIGIN))
.unwrap_or(Ordering::Equal)
.then_with(|| a.y.partial_cmp(&b.y).unwrap_or(Ordering::Equal))
});
let mut output = Vec::new();

View file

@ -213,16 +213,14 @@ impl Layer {
&current.primitives,
|item| match item {
Item::Live(primitive) => vec![primitive.visible_bounds()],
Item::Group(primitives, bounds, transformation) => {
damage::group(
Item::Group(primitives, group_bounds, transformation) => {
primitives
.as_slice()
.iter()
.map(Primitive::visible_bounds)
.map(|bounds| bounds * *transformation)
.collect(),
*bounds,
)
.filter_map(|bounds| bounds.intersection(group_bounds))
.collect()
}
Item::Cached(_, bounds, _) => {
vec![*bounds]