diff options
Diffstat (limited to 'src/geometry')
| -rw-r--r-- | src/geometry/broad_phase_multi_sap/broad_phase.rs | 4 | ||||
| -rw-r--r-- | src/geometry/collider_components.rs | 8 | ||||
| -rw-r--r-- | src/geometry/narrow_phase.rs | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/geometry/broad_phase_multi_sap/broad_phase.rs b/src/geometry/broad_phase_multi_sap/broad_phase.rs index d2b0076..0149adf 100644 --- a/src/geometry/broad_phase_multi_sap/broad_phase.rs +++ b/src/geometry/broad_phase_multi_sap/broad_phase.rs @@ -634,7 +634,7 @@ mod test { let mut multibody_joints = MultibodyJointSet::new(); let mut islands = IslandManager::new(); - let rb = RigidBodyBuilder::new_dynamic().build(); + let rb = RigidBodyBuilder::dynamic().build(); let co = ColliderBuilder::ball(0.5).build(); let hrb = bodies.insert(rb); let coh = colliders.insert_with_parent(co, hrb, &mut bodies); @@ -652,7 +652,7 @@ mod test { broad_phase.update(0.0, &mut colliders, &[], &[coh], &mut events); // Create another body. - let rb = RigidBodyBuilder::new_dynamic().build(); + let rb = RigidBodyBuilder::dynamic().build(); let co = ColliderBuilder::ball(0.5).build(); let hrb = bodies.insert(rb); let coh = colliders.insert_with_parent(co, hrb, &mut bodies); diff --git a/src/geometry/collider_components.rs b/src/geometry/collider_components.rs index fe2961f..5f27823 100644 --- a/src/geometry/collider_components.rs +++ b/src/geometry/collider_components.rs @@ -285,18 +285,18 @@ bitflags::bitflags! { /// and another collider attached to a kinematic body. const DYNAMIC_KINEMATIC = 0b0000_0000_0000_1100; /// Enable collision-detection between a collider attached to a dynamic body - /// and another collider attached to a static body (or not attached to any body). + /// and another collider attached to a fixed body (or not attached to any body). const DYNAMIC_STATIC = 0b0000_0000_0000_0010; /// Enable collision-detection between a collider attached to a kinematic body /// and another collider attached to a kinematic body. const KINEMATIC_KINEMATIC = 0b1100_1100_0000_0000; /// Enable collision-detection between a collider attached to a kinematic body - /// and another collider attached to a static body (or not attached to any body). + /// and another collider attached to a fixed body (or not attached to any body). const KINEMATIC_STATIC = 0b0010_0010_0000_0000; - /// Enable collision-detection between a collider attached to a static body (or - /// not attached to any body) and another collider attached to a static body (or + /// Enable collision-detection between a collider attached to a fixed body (or + /// not attached to any body) and another collider attached to a fixed body (or /// not attached to any body). const STATIC_STATIC = 0b0000_0000_0010_0000; } diff --git a/src/geometry/narrow_phase.rs b/src/geometry/narrow_phase.rs index 400c635..cf78b81 100644 --- a/src/geometry/narrow_phase.rs +++ b/src/geometry/narrow_phase.rs @@ -392,7 +392,7 @@ impl NarrowPhase { // For each modified colliders, we need to wake-up the bodies it is in contact with // so that the narrow-phase properly takes into account the change in, e.g., // collision groups. Waking up the modified collider's parent isn't enough because - // it could be a static or kinematic body which don't propagate the wake-up state. + // it could be a fixed or kinematic body which don't propagate the wake-up state. let co_parent: Option<&ColliderParent> = colliders.get(handle.0); let (co_changes, co_type): (&ColliderChanges, &ColliderType) = @@ -740,8 +740,8 @@ impl NarrowPhase { } // TODO: avoid lookup into bodies. - let mut rb_type1 = RigidBodyType::Static; - let mut rb_type2 = RigidBodyType::Static; + let mut rb_type1 = RigidBodyType::Fixed; + let mut rb_type2 = RigidBodyType::Fixed; if let Some(co_parent1) = co_parent1 { rb_type1 = *bodies.index(co_parent1.handle.0); @@ -865,8 +865,8 @@ impl NarrowPhase { } // TODO: avoid lookup into bodies. - let mut rb_type1 = RigidBodyType::Static; - let mut rb_type2 = RigidBodyType::Static; + let mut rb_type1 = RigidBodyType::Fixed; + let mut rb_type2 = RigidBodyType::Fixed; if let Some(co_parent1) = co_parent1 { rb_type1 = *bodies.index(co_parent1.handle.0); @@ -1076,7 +1076,7 @@ impl NarrowPhase { bodies.index_bundle(handle1.0); (data.0.active_island_id, *data.1, data.2.sleeping) } else { - (0, RigidBodyType::Static, true) + (0, RigidBodyType::Fixed, true) }; let (active_island_id2, rb_type2, sleeping2) = @@ -1085,7 +1085,7 @@ impl NarrowPhase { bodies.index_bundle(handle2.0); (data.0.active_island_id, *data.1, data.2.sleeping) } else { - (0, RigidBodyType::Static, true) + (0, RigidBodyType::Fixed, true) }; if (rb_type1.is_dynamic() || rb_type2.is_dynamic()) |