diff --git a/Cargo.lock b/Cargo.lock index a070c388e3..8dc93d5988 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4433,7 +4433,7 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "rapier2d" version = "0.18.0" -source = "git+https://github.com/MaxCWhitehead/rapier?branch=fix-dynamic-change#6eed9a53a58e33263f1b9cf7bb41f6c443966c35" +source = "git+https://github.com/dimforge/rapier?rev=e69e73e589cf4525c96ee7b919032c80ce205244#e69e73e589cf4525c96ee7b919032c80ce205244" dependencies = [ "approx", "arrayvec", diff --git a/Cargo.toml b/Cargo.toml index 4276f3b1e1..1f6fcfb06b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ tracing = "0.1.37" puffin = { version = "0.17.0", features = ["web"] } puffin_egui = "0.23.0" petgraph = "0.6.4" -rapier2d = { git = "https://github.com/MaxCWhitehead/rapier", branch = "fix-dynamic-change", features = ["debug-render", "enhanced-determinism"] } +rapier2d = { git = "https://github.com/dimforge/rapier", rev= "e69e73e589cf4525c96ee7b919032c80ce205244", features = ["debug-render", "enhanced-determinism"] } indexmap = "2.0.0" serde = { version = "1.0.188", features = ["derive"] } shiftnanigans = "0.3.3" diff --git a/src/core/physics/collisions.rs b/src/core/physics/collisions.rs index d5180102f6..c9adddc891 100644 --- a/src/core/physics/collisions.rs +++ b/src/core/physics/collisions.rs @@ -21,7 +21,7 @@ use crate::prelude::*; #[derive(HasSchema, Default)] pub struct RapierContext { pub collision_pipeline: rapier::CollisionPipeline, - pub broad_phase: rapier::BroadPhase, + pub broad_phase: rapier::DefaultBroadPhase, pub narrow_phase: rapier::NarrowPhase, pub query_pipeline: rapier::QueryPipeline, pub collider_set: rapier::ColliderSet,