Rename modify_contacts -> modify_solver_contacts.
This commit is contained in:
@@ -77,12 +77,12 @@ pub fn init_world(testbed: &mut Testbed) {
|
|||||||
|
|
||||||
let collider = ColliderBuilder::cuboid(25.0, 0.5)
|
let collider = ColliderBuilder::cuboid(25.0, 0.5)
|
||||||
.translation(30.0, 2.0)
|
.translation(30.0, 2.0)
|
||||||
.modify_contacts(true)
|
.modify_solver_contacts(true)
|
||||||
.build();
|
.build();
|
||||||
let platform1 = colliders.insert(collider, handle, &mut bodies);
|
let platform1 = colliders.insert(collider, handle, &mut bodies);
|
||||||
let collider = ColliderBuilder::cuboid(25.0, 0.5)
|
let collider = ColliderBuilder::cuboid(25.0, 0.5)
|
||||||
.translation(-30.0, -2.0)
|
.translation(-30.0, -2.0)
|
||||||
.modify_contacts(true)
|
.modify_solver_contacts(true)
|
||||||
.build();
|
.build();
|
||||||
let platform2 = colliders.insert(collider, handle, &mut bodies);
|
let platform2 = colliders.insert(collider, handle, &mut bodies);
|
||||||
|
|
||||||
|
|||||||
@@ -77,12 +77,12 @@ pub fn init_world(testbed: &mut Testbed) {
|
|||||||
|
|
||||||
let collider = ColliderBuilder::cuboid(9.0, 0.5, 25.0)
|
let collider = ColliderBuilder::cuboid(9.0, 0.5, 25.0)
|
||||||
.translation(0.0, 2.0, 30.0)
|
.translation(0.0, 2.0, 30.0)
|
||||||
.modify_contacts(true)
|
.modify_solver_contacts(true)
|
||||||
.build();
|
.build();
|
||||||
let platform1 = colliders.insert(collider, handle, &mut bodies);
|
let platform1 = colliders.insert(collider, handle, &mut bodies);
|
||||||
let collider = ColliderBuilder::cuboid(9.0, 0.5, 25.0)
|
let collider = ColliderBuilder::cuboid(9.0, 0.5, 25.0)
|
||||||
.translation(0.0, -2.0, -30.0)
|
.translation(0.0, -2.0, -30.0)
|
||||||
.modify_contacts(true)
|
.modify_solver_contacts(true)
|
||||||
.build();
|
.build();
|
||||||
let platform2 = colliders.insert(collider, handle, &mut bodies);
|
let platform2 = colliders.insert(collider, handle, &mut bodies);
|
||||||
|
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ pub struct ColliderBuilder {
|
|||||||
pub is_sensor: bool,
|
pub is_sensor: bool,
|
||||||
/// Do we have to always call the contact modifier
|
/// Do we have to always call the contact modifier
|
||||||
/// on this collider?
|
/// on this collider?
|
||||||
pub modify_contacts: bool,
|
pub modify_solver_contacts: bool,
|
||||||
/// The user-data of the collider being built.
|
/// The user-data of the collider being built.
|
||||||
pub user_data: u128,
|
pub user_data: u128,
|
||||||
/// The collision groups for the collider being built.
|
/// The collision groups for the collider being built.
|
||||||
@@ -186,7 +186,7 @@ impl ColliderBuilder {
|
|||||||
solver_groups: InteractionGroups::all(),
|
solver_groups: InteractionGroups::all(),
|
||||||
friction_combine_rule: CoefficientCombineRule::Average,
|
friction_combine_rule: CoefficientCombineRule::Average,
|
||||||
restitution_combine_rule: CoefficientCombineRule::Average,
|
restitution_combine_rule: CoefficientCombineRule::Average,
|
||||||
modify_contacts: false,
|
modify_solver_contacts: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -463,8 +463,8 @@ impl ColliderBuilder {
|
|||||||
|
|
||||||
/// If set to `true` then the physics hooks will always run to modify
|
/// If set to `true` then the physics hooks will always run to modify
|
||||||
/// contacts involving this collider.
|
/// contacts involving this collider.
|
||||||
pub fn modify_contacts(mut self, modify_contacts: bool) -> Self {
|
pub fn modify_solver_contacts(mut self, modify_solver_contacts: bool) -> Self {
|
||||||
self.modify_contacts = modify_contacts;
|
self.modify_solver_contacts = modify_solver_contacts;
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -547,7 +547,10 @@ impl ColliderBuilder {
|
|||||||
.with_friction_combine_rule(self.friction_combine_rule)
|
.with_friction_combine_rule(self.friction_combine_rule)
|
||||||
.with_restitution_combine_rule(self.restitution_combine_rule);
|
.with_restitution_combine_rule(self.restitution_combine_rule);
|
||||||
let mut solver_flags = SolverFlags::default();
|
let mut solver_flags = SolverFlags::default();
|
||||||
solver_flags.set(SolverFlags::MODIFY_SOLVER_CONTACTS, self.modify_contacts);
|
solver_flags.set(
|
||||||
|
SolverFlags::MODIFY_SOLVER_CONTACTS,
|
||||||
|
self.modify_solver_contacts,
|
||||||
|
);
|
||||||
|
|
||||||
Collider {
|
Collider {
|
||||||
shape: self.shape.clone(),
|
shape: self.shape.clone(),
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ pub trait PhysicsHooks: Send + Sync {
|
|||||||
/// contains the `PhysicsHooksFlags::MODIFY_SOLVER_CONTACTS` flags.
|
/// contains the `PhysicsHooksFlags::MODIFY_SOLVER_CONTACTS` flags.
|
||||||
///
|
///
|
||||||
/// By default, the content of `solver_contacts` is computed from `manifold.points`.
|
/// By default, the content of `solver_contacts` is computed from `manifold.points`.
|
||||||
/// This method will be called on each contact manifold which have the flag `SolverFlags::MODIFY_CONTACTS` set.
|
/// This method will be called on each contact manifold which have the flag `SolverFlags::modify_solver_contacts` set.
|
||||||
/// This method can be used to modify the set of solver contacts seen by the constraints solver: contacts
|
/// This method can be used to modify the set of solver contacts seen by the constraints solver: contacts
|
||||||
/// can be removed and modified.
|
/// can be removed and modified.
|
||||||
///
|
///
|
||||||
|
|||||||
Reference in New Issue
Block a user