From 6965177e78fcdf1b030aa1df11cc70ad1048e84f Mon Sep 17 00:00:00 2001 From: Mikolaj Wielgus Date: Thu, 14 Mar 2024 13:59:22 +0000 Subject: [PATCH] layout: access shape via layout instead of getting it from a cache --- src/layout/layout.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layout/layout.rs b/src/layout/layout.rs index 904c2d7..a3eb4b1 100644 --- a/src/layout/layout.rs +++ b/src/layout/layout.rs @@ -735,7 +735,7 @@ impl Layout { .clamp(0.0, f64::INFINITY), ); - inflated_shape.intersects(wrapper.geom()) + inflated_shape.intersects(&wrapper.data.primitive(self).shape()) }) .map(|wrapper| wrapper.data) .next() @@ -751,7 +751,7 @@ impl Layout { .rtree() .locate_in_envelope_intersecting(&RTreeObject::envelope(&shape)) .filter(|wrapper| !self.are_connectable(node, wrapper.data)) - .filter(|wrapper| shape.intersects(wrapper.geom())) + .filter(|wrapper| shape.intersects(&wrapper.data.primitive(self).shape())) .map(|wrapper| wrapper.data) .next() .and_then(|collidee| Some(Collision(shape, collidee)))