From 2d4e14b869bd8d0b2eb6629b7b10719d657d2be8 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Wed, 25 Nov 2020 16:00:02 +0100 Subject: Properly track some user-initiatied rigid-body modifications. --- src/geometry/broad_phase_multi_sap.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/geometry/broad_phase_multi_sap.rs') diff --git a/src/geometry/broad_phase_multi_sap.rs b/src/geometry/broad_phase_multi_sap.rs index 4cea113..d3a0d5a 100644 --- a/src/geometry/broad_phase_multi_sap.rs +++ b/src/geometry/broad_phase_multi_sap.rs @@ -634,6 +634,7 @@ impl BroadPhase { .active_dynamic_set .iter() .chain(bodies.active_kinematic_set.iter()) + .chain(bodies.modified_inactive_set.iter()) { for handle in &bodies[*body_handle].colliders { let collider = &mut colliders[*handle]; -- cgit From f293dc602451ddf3c13ce6272f9d3556d47f4fca Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Thu, 26 Nov 2020 11:37:58 +0100 Subject: Fix bogus collider removal in the broad-phase. --- src/geometry/broad_phase_multi_sap.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/geometry/broad_phase_multi_sap.rs') diff --git a/src/geometry/broad_phase_multi_sap.rs b/src/geometry/broad_phase_multi_sap.rs index d3a0d5a..cd55f8b 100644 --- a/src/geometry/broad_phase_multi_sap.rs +++ b/src/geometry/broad_phase_multi_sap.rs @@ -586,9 +586,6 @@ impl BroadPhase { let proxy = &mut self.proxies[proxy_index]; - // Push the proxy to infinity, but not beyond the sentinels. - proxy.aabb.mins.coords.fill(SENTINEL_VALUE / 2.0); - proxy.aabb.maxs.coords.fill(SENTINEL_VALUE / 2.0); // Discretize the AABB to find the regions that need to be invalidated. let start = point_key(proxy.aabb.mins); let end = point_key(proxy.aabb.maxs); @@ -615,6 +612,9 @@ impl BroadPhase { } } + // Push the proxy to infinity, but not beyond the sentinels. + proxy.aabb.mins.coords.fill(SENTINEL_VALUE / 2.0); + proxy.aabb.maxs.coords.fill(SENTINEL_VALUE / 2.0); self.proxies.remove(proxy_index); } -- cgit From 340f614d32fbf32b48a63d1c381da67eec97b05d Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Thu, 26 Nov 2020 12:49:35 +0100 Subject: Restore the previous sleeping pattern. --- src/geometry/broad_phase_multi_sap.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/geometry/broad_phase_multi_sap.rs') diff --git a/src/geometry/broad_phase_multi_sap.rs b/src/geometry/broad_phase_multi_sap.rs index cd55f8b..863990d 100644 --- a/src/geometry/broad_phase_multi_sap.rs +++ b/src/geometry/broad_phase_multi_sap.rs @@ -631,10 +631,10 @@ impl BroadPhase { self.complete_removals(); for body_handle in bodies - .active_dynamic_set + .modified_inactive_set .iter() + .chain(bodies.active_dynamic_set.iter()) .chain(bodies.active_kinematic_set.iter()) - .chain(bodies.modified_inactive_set.iter()) { for handle in &bodies[*body_handle].colliders { let collider = &mut colliders[*handle]; -- cgit