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

Simple fix: Always remove empty SAPRegions

Browse Source
This commit is contained in:
Robert Hrusecky
2020-10-05 18:43:35 -05:00
parent 1e0b4dcd1d
commit d7ff0826d2
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/geometry/broad_phase_multi_sap.rs
View File

@@ -204,13 +204,13 @@ impl SAPAxis {
} }
} }
fn delete_out_of_bounds_proxies(&self, existing_proxies: &mut BitVec) -> bool { fn delete_out_of_bounds_proxies(&self, existing_proxies: &mut BitVec) -> usize {
let mut deleted_any = false; let mut deleted = 0;
for endpoint in &self.endpoints { for endpoint in &self.endpoints {
if endpoint.value < self.min_bound { if endpoint.value < self.min_bound {
if endpoint.is_end() { if endpoint.is_end() {
existing_proxies.set(endpoint.proxy() as usize, false); existing_proxies.set(endpoint.proxy() as usize, false);
deleted_any = true; deleted += 1;
} }
} else { } else {
break; break;
@@ -221,14 +221,14 @@ impl SAPAxis {
if endpoint.value > self.max_bound { if endpoint.value > self.max_bound {
if endpoint.is_start() { if endpoint.is_start() {
existing_proxies.set(endpoint.proxy() as usize, false); existing_proxies.set(endpoint.proxy() as usize, false);
deleted_any = true; deleted += 1;
} }
} else { } else {
break; break;
} }
} }
deleted_any deleted
} }
fn delete_out_of_bounds_endpoints(&mut self, existing_proxies: &BitVec) { fn delete_out_of_bounds_endpoints(&mut self, existing_proxies: &BitVec) {
@@ -304,6 +304,7 @@ struct SAPRegion {
#[cfg_attr(feature = "serde-serialize", serde(skip))] #[cfg_attr(feature = "serde-serialize", serde(skip))]
to_insert: Vec<usize>, // Workspace to_insert: Vec<usize>, // Workspace
need_update: bool, need_update: bool,
proxy_count: usize,
} }
impl SAPRegion { impl SAPRegion {
@@ -319,6 +320,7 @@ impl SAPRegion {
existing_proxies: BitVec::new(), existing_proxies: BitVec::new(),
to_insert: Vec::new(), to_insert: Vec::new(),
need_update: false, need_update: false,
proxy_count: 0,
} }
} }
@@ -338,6 +340,7 @@ impl SAPRegion {
if !self.existing_proxies[proxy_id] { if !self.existing_proxies[proxy_id] {
self.to_insert.push(proxy_id); self.to_insert.push(proxy_id);
self.existing_proxies.set(proxy_id, true); self.existing_proxies.set(proxy_id, true);
self.proxy_count += 1;
false false
} else { } else {
self.need_update = true; self.need_update = true;
@@ -348,15 +351,14 @@ impl SAPRegion {
pub fn update(&mut self, proxies: &Proxies, reporting: &mut HashMap<(u32, u32), bool>) { pub fn update(&mut self, proxies: &Proxies, reporting: &mut HashMap<(u32, u32), bool>) {
if self.need_update { if self.need_update {
// Update endpoints. // Update endpoints.
let mut deleted_any = false; let mut deleted = 0;
for dim in 0..DIM { for dim in 0..DIM {
self.axii[dim].update_endpoints(dim, proxies, reporting); self.axii[dim].update_endpoints(dim, proxies, reporting);
deleted_any = self.axii[dim] deleted += self.axii[dim].delete_out_of_bounds_proxies(&mut self.existing_proxies);
.delete_out_of_bounds_proxies(&mut self.existing_proxies)
|| deleted_any;
} }
if deleted_any { if deleted > 0 {
self.proxy_count -= deleted;
for dim in 0..DIM { for dim in 0..DIM {
self.axii[dim].delete_out_of_bounds_endpoints(&self.existing_proxies); self.axii[dim].delete_out_of_bounds_endpoints(&self.existing_proxies);
} }
@@ -588,12 +590,19 @@ impl BroadPhase {
} }
} }
pub(crate) fn complete_removals(&mut self) { fn update_regions(&mut self) {
if self.deleted_any {
for (_, region) in &mut self.regions { for (_, region) in &mut self.regions {
region.update(&self.proxies, &mut self.reporting); region.update(&self.proxies, &mut self.reporting);
} }
// Remove all the empty regions
self.regions.retain(|_, region| region.proxy_count > 0);
}
pub(crate) fn complete_removals(&mut self) {
if self.deleted_any {
self.update_regions();
// NOTE: we don't care about reporting pairs. // NOTE: we don't care about reporting pairs.
self.reporting.clear(); self.reporting.clear();
self.deleted_any = false; self.deleted_any = false;
@@ -604,9 +613,7 @@ impl BroadPhase {
// println!("num regions: {}", self.regions.len()); // println!("num regions: {}", self.regions.len());
self.reporting.clear(); self.reporting.clear();
for (_, region) in &mut self.regions { self.update_regions();
region.update(&self.proxies, &mut self.reporting)
}
// Convert reports to broad phase events. // Convert reports to broad phase events.
// let t = instant::now(); // let t = instant::now();