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

cargo fmt

Browse Source
This commit is contained in:
rezural
2020-12-31 13:31:30 +11:00
parent 26af08e03c
commit e11ace3831
6 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples2d/add_remove2.rs
View File

@@ -19,7 +19,7 @@ pub fn init_world(testbed: &mut Testbed) {
physics physics
.colliders .colliders
.insert(collider, handle, &mut physics.bodies); .insert(collider, handle, &mut physics.bodies);
// TODO: need a way to access graphics & window // TODO: need a way to access graphics & window
// graphics.add(window, handle, &physics.bodies, &physics.colliders); // graphics.add(window, handle, &physics.bodies, &physics.colliders);
@@ -33,7 +33,7 @@ pub fn init_world(testbed: &mut Testbed) {
physics physics
.bodies .bodies
.remove(handle, &mut physics.colliders, &mut physics.joints); .remove(handle, &mut physics.colliders, &mut physics.joints);
// TODO: need a way to access graphics & window // TODO: need a way to access graphics & window
// graphics.remove_body_nodes(window, handle); // graphics.remove_body_nodes(window, handle);
} }

30
examples2d/platform2.rs
View File

@@ -60,23 +60,25 @@ pub fn init_world(testbed: &mut Testbed) {
/* /*
* Setup a callback to control the platform. * Setup a callback to control the platform.
*/ */
testbed.harness_mut().add_callback(move |physics, _, run_state, _| { testbed
let platform = physics.bodies.get_mut(platform_handle).unwrap(); .harness_mut()
let mut next_pos = *platform.position(); .add_callback(move |physics, _, run_state, _| {
let platform = physics.bodies.get_mut(platform_handle).unwrap();
let mut next_pos = *platform.position();
let dt = 0.016; let dt = 0.016;
next_pos.translation.vector.y += (run_state.time * 5.0).sin() * dt; next_pos.translation.vector.y += (run_state.time * 5.0).sin() * dt;
next_pos.translation.vector.x += run_state.time.sin() * 5.0 * dt; next_pos.translation.vector.x += run_state.time.sin() * 5.0 * dt;
if next_pos.translation.vector.x >= rad * 10.0 { if next_pos.translation.vector.x >= rad * 10.0 {
next_pos.translation.vector.x -= dt; next_pos.translation.vector.x -= dt;
} }
if next_pos.translation.vector.x <= -rad * 10.0 { if next_pos.translation.vector.x <= -rad * 10.0 {
next_pos.translation.vector.x += dt; next_pos.translation.vector.x += dt;
} }
platform.set_next_kinematic_position(next_pos); platform.set_next_kinematic_position(next_pos);
}); });
/* /*
* Run the simulation. * Run the simulation.

36
examples2d/sensor2.rs
View File

@@ -69,26 +69,28 @@ pub fn init_world(testbed: &mut Testbed) {
testbed.set_body_color(sensor_handle, Point3::new(0.5, 1.0, 1.0)); testbed.set_body_color(sensor_handle, Point3::new(0.5, 1.0, 1.0));
// Callback that will be executed on the main loop to handle proximities. // Callback that will be executed on the main loop to handle proximities.
testbed.harness_mut().add_callback(move |physics, events, _, _| { testbed
while let Ok(prox) = events.proximity_events.try_recv() { .harness_mut()
let color = match prox.new_status { .add_callback(move |physics, events, _, _| {
Proximity::WithinMargin | Proximity::Intersecting => Point3::new(1.0, 1.0, 0.0), while let Ok(prox) = events.proximity_events.try_recv() {
Proximity::Disjoint => Point3::new(0.5, 0.5, 1.0), let color = match prox.new_status {
}; Proximity::WithinMargin | Proximity::Intersecting => Point3::new(1.0, 1.0, 0.0),
Proximity::Disjoint => Point3::new(0.5, 0.5, 1.0),
};
let parent_handle1 = physics.colliders.get(prox.collider1).unwrap().parent(); let parent_handle1 = physics.colliders.get(prox.collider1).unwrap().parent();
let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent(); let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent();
if parent_handle1 != ground_handle && parent_handle1 != sensor_handle { if parent_handle1 != ground_handle && parent_handle1 != sensor_handle {
// TODO: need a way to access graphics & window // TODO: need a way to access graphics & window
// graphics.set_body_color(parent_handle1, color); // graphics.set_body_color(parent_handle1, color);
}
if parent_handle2 != ground_handle && parent_handle2 != sensor_handle {
// TODO: need a way to access graphics & window
// graphics.set_body_color(parent_handle2, color);
}
} }
if parent_handle2 != ground_handle && parent_handle2 != sensor_handle { });
// TODO: need a way to access graphics & window
// graphics.set_body_color(parent_handle2, color);
}
}
});
/* /*
* Set up the testbed. * Set up the testbed.

2
examples3d/fountain3.rs
View File

@@ -68,7 +68,7 @@ pub fn init_world(testbed: &mut Testbed) {
physics physics
.narrow_phase .narrow_phase
.maintain(&mut physics.colliders, &mut physics.bodies); .maintain(&mut physics.colliders, &mut physics.bodies);
// TODO: need a way to access graphics & window // TODO: need a way to access graphics & window
// graphics.remove_body_nodes(window, *handle); // graphics.remove_body_nodes(window, *handle);
} }

44
examples3d/platform3.rs
View File

@@ -65,29 +65,31 @@ pub fn init_world(testbed: &mut Testbed) {
* Setup a callback to control the platform. * Setup a callback to control the platform.
*/ */
let mut count = 0; let mut count = 0;
testbed.harness_mut().add_callback(move |physics, _, run_state, _| { testbed
count += 1; .harness_mut()
if count % 100 > 50 { .add_callback(move |physics, _, run_state, _| {
return; count += 1;
} if count % 100 > 50 {
return;
if let Some(platform) = physics.bodies.get_mut(platform_handle) {
let mut next_pos = *platform.position();
let dt = 0.016;
next_pos.translation.vector.y += (run_state.time * 5.0).sin() * dt;
next_pos.translation.vector.z += run_state.time.sin() * 5.0 * dt;
if next_pos.translation.vector.z >= rad * 10.0 {
next_pos.translation.vector.z -= dt;
}
if next_pos.translation.vector.z <= -rad * 10.0 {
next_pos.translation.vector.z += dt;
} }
platform.set_next_kinematic_position(next_pos); if let Some(platform) = physics.bodies.get_mut(platform_handle) {
} let mut next_pos = *platform.position();
});
let dt = 0.016;
next_pos.translation.vector.y += (run_state.time * 5.0).sin() * dt;
next_pos.translation.vector.z += run_state.time.sin() * 5.0 * dt;
if next_pos.translation.vector.z >= rad * 10.0 {
next_pos.translation.vector.z -= dt;
}
if next_pos.translation.vector.z <= -rad * 10.0 {
next_pos.translation.vector.z += dt;
}
platform.set_next_kinematic_position(next_pos);
}
});
/* /*
* Run the simulation. * Run the simulation.

36
examples3d/sensor3.rs
View File

@@ -73,26 +73,28 @@ pub fn init_world(testbed: &mut Testbed) {
testbed.set_body_color(sensor_handle, Point3::new(0.5, 1.0, 1.0)); testbed.set_body_color(sensor_handle, Point3::new(0.5, 1.0, 1.0));
// Callback that will be executed on the main loop to handle proximities. // Callback that will be executed on the main loop to handle proximities.
testbed.harness_mut().add_callback(move |physics, events, _, _| { testbed
while let Ok(prox) = events.proximity_events.try_recv() { .harness_mut()
let color = match prox.new_status { .add_callback(move |physics, events, _, _| {
Proximity::WithinMargin | Proximity::Intersecting => Point3::new(1.0, 1.0, 0.0), while let Ok(prox) = events.proximity_events.try_recv() {
Proximity::Disjoint => Point3::new(0.5, 0.5, 1.0), let color = match prox.new_status {
}; Proximity::WithinMargin | Proximity::Intersecting => Point3::new(1.0, 1.0, 0.0),
Proximity::Disjoint => Point3::new(0.5, 0.5, 1.0),
};
let parent_handle1 = physics.colliders.get(prox.collider1).unwrap().parent(); let parent_handle1 = physics.colliders.get(prox.collider1).unwrap().parent();
let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent(); let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent();
if parent_handle1 != ground_handle && parent_handle1 != sensor_handle { if parent_handle1 != ground_handle && parent_handle1 != sensor_handle {
// TODO: need a way to access graphics & window // TODO: need a way to access graphics & window
// graphics.set_body_color(parent_handle1, color); // graphics.set_body_color(parent_handle1, color);
}
if parent_handle2 != ground_handle && parent_handle2 != sensor_handle {
// TODO: need a way to access graphics & window
// graphics.set_body_color(parent_handle2, color);
}
} }
if parent_handle2 != ground_handle && parent_handle2 != sensor_handle { });
// TODO: need a way to access graphics & window
// graphics.set_body_color(parent_handle2, color);
}
}
});
/* /*
* Set up the testbed. * Set up the testbed.