nichkara/rapier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix collider removal from narrow-phase when the same collider is listed twice.

Browse Source
This commit is contained in:
Crozet Sébastien
2021-06-08 18:05:01 +02:00
committed by Sébastien Crozet
parent bccb7d4c66
commit ff6c75f3bd
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/geometry/narrow_phase.rs
View File

@@ -270,7 +270,10 @@ impl NarrowPhase {
for collider in removed_colliders {
// NOTE: if the collider does not have any graph indices currently, there is nothing
// to remove in the narrow-phase for this collider.
if let Some(graph_idx) = self.graph_indices.get(collider.0) {
if let Some(graph_idx) = self
.graph_indices
.remove(collider.0, ColliderGraphIndices::invalid())
{
let intersection_graph_id = prox_id_remap
.get(collider)
.copied()
@@ -330,6 +333,10 @@ impl NarrowPhase {
replacement.intersection_graph_index = intersection_graph_id;
} else {
prox_id_remap.insert(replacement, intersection_graph_id);
// I feel like this should never happen now that the narrow-phase is the one owning
// the graph_indices. Let's put an unreachable in there and see if anybody still manages
// to reach it. If nobody does, we will remove this.
unreachable!();
}
}
@@ -338,6 +345,10 @@ impl NarrowPhase {
replacement.contact_graph_index = contact_graph_id;
} else {
contact_id_remap.insert(replacement, contact_graph_id);
// I feel like this should never happen now that the narrow-phase is the one owning
// the graph_indices. Let's put an unreachable in there and see if anybody still manages
// to reach it. If nobody does, we will remove this.
unreachable!();
}
}
}