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

fix compilation for feature enhanced-determinism (#739)

Browse Source
This commit is contained in:
Thierry Berger
2024-09-23 18:15:29 +02:00
committed by GitHub
parent 76357e3588
commit 9e1113c5c7
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/rapier-ci-build.yml vendored
View File

@@ -59,6 +59,10 @@ jobs:
run: cd crates/rapier_testbed2d; cargo check --verbose --features parallel; run: cd crates/rapier_testbed2d; cargo check --verbose --features parallel;
- name: Check rapier_testbed3d --features parallel - name: Check rapier_testbed3d --features parallel
run: cd crates/rapier_testbed3d; cargo check --verbose --features parallel; run: cd crates/rapier_testbed3d; cargo check --verbose --features parallel;
- name: Check rapier_testbed2d --features enhanced-determinism
run: cd crates/rapier2d; cargo check --verbose --features enhanced-determinism;
- name: Check rapier_testbed3d --features enhanced-determinism
run: cd crates/rapier3d; cargo check --verbose --features enhanced-determinism;
- name: Check rapier-examples-2d - name: Check rapier-examples-2d
run: cargo check -j 1 --verbose -p rapier-examples-2d; run: cargo check -j 1 --verbose -p rapier-examples-2d;
- name: Check rapier-examples-3d - name: Check rapier-examples-3d

7
src/geometry/broad_phase_multi_sap/broad_phase_multi_sap.rs
View File

@@ -231,7 +231,12 @@ impl BroadPhaseMultiSap {
* Actually remove the colliders proxies. * Actually remove the colliders proxies.
*/ */
for removed in removed_colliders { for removed in removed_colliders {
if let Some(proxy_id) = self.colliders_proxy_ids.remove(removed) { #[cfg(feature = "enhanced-determinism")]
let proxy_id = self.colliders_proxy_ids.swap_remove(removed);
#[cfg(not(feature = "enhanced-determinism"))]
let proxy_id = self.colliders_proxy_ids.remove(removed);
if let Some(proxy_id) = proxy_id {
if proxy_id != crate::INVALID_U32 { if proxy_id != crate::INVALID_U32 {
self.proxies.remove(proxy_id); self.proxies.remove(proxy_id);
} }

3
src/geometry/broad_phase_multi_sap/sap_layer.rs
View File

@@ -356,6 +356,9 @@ impl SAPLayer {
// Check if we can actually delete this region. // Check if we can actually delete this region.
if !region.contains_subproper_proxies() { if !region.contains_subproper_proxies() {
#[cfg(feature = "enhanced-determinism")]
let region_id = region_id.swap_remove();
#[cfg(not(feature = "enhanced-determinism"))]
let region_id = region_id.remove(); let region_id = region_id.remove();
// We can delete this region. So we need to tell the larger // We can delete this region. So we need to tell the larger

12
src/pipeline/physics_pipeline.rs
View File

@@ -426,11 +426,17 @@ impl PhysicsPipeline {
// Apply some of delayed wake-ups. // Apply some of delayed wake-ups.
self.counters.stages.user_changes.start(); self.counters.stages.user_changes.start();
for handle in impulse_joints #[cfg(feature = "enhanced-determinism")]
let impulse_joints_iterator = impulse_joints
.to_wake_up
.drain(..)
.chain(multibody_joints.to_wake_up.drain(..));
#[cfg(not(feature = "enhanced-determinism"))]
let impulse_joints_iterator = impulse_joints
.to_wake_up .to_wake_up
.drain() .drain()
.chain(multibody_joints.to_wake_up.drain()) .chain(multibody_joints.to_wake_up.drain());
{ for handle in impulse_joints_iterator {
islands.wake_up(bodies, handle.0, true); islands.wake_up(bodies, handle.0, true);
} }