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

enable graphics and windows related code in examples

Browse Source
This commit is contained in:
rezural
2021-01-03 19:54:56 +11:00
parent 34e79e9afc
commit 5ca82eeaee
6 changed files with 37 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples2d/add_remove2.rs
View File

@@ -10,7 +10,7 @@ pub fn init_world(testbed: &mut Testbed) {
let rad = 0.5;
// Callback that will be executed on the main loop to handle proximities.
testbed.add_callback(move |window, graphics, physics, _, _| {
testbed.add_callback(move |mut window, mut graphics, physics, _, _| {
let rigid_body = RigidBodyBuilder::new_dynamic()
.translation(0.0, 10.0)
.build();
@@ -20,10 +20,8 @@ pub fn init_world(testbed: &mut Testbed) {
.colliders
.insert(collider, handle, &mut physics.bodies);
if graphics.is_some() {
graphics
.unwrap()
.add(window.unwrap(), handle, &physics.bodies, &physics.colliders);
if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
graphics.add(*window, handle, &physics.bodies, &physics.colliders);
}
let to_remove: Vec<_> = physics
@@ -37,10 +35,9 @@ pub fn init_world(testbed: &mut Testbed) {
.bodies
.remove(handle, &mut physics.colliders, &mut physics.joints);
// FIXME: need a way to access graphics & window in a loop
// if graphics.is_some() {
// graphics.unwrap().remove_body_nodes(window.unwrap(), handle);
// }
if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
graphics.remove_body_nodes(*window, handle);
}
}
});

17
examples2d/sensor2.rs
View File

@@ -69,7 +69,7 @@ pub fn init_world(testbed: &mut Testbed) {
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.
testbed.add_callback(move |_, _, physics, events, _| {
testbed.add_callback(move |_, mut graphics, physics, events, _| {
while let Ok(prox) = events.proximity_events.try_recv() {
let color = match prox.new_status {
Proximity::WithinMargin | Proximity::Intersecting => Point3::new(1.0, 1.0, 0.0),
@@ -78,14 +78,13 @@ pub fn init_world(testbed: &mut Testbed) {
let parent_handle1 = physics.colliders.get(prox.collider1).unwrap().parent();
let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent();
if parent_handle1 != ground_handle && parent_handle1 != sensor_handle {
// FIXME: need a way to access graphics & window in a loop
// graphics.set_body_color(parent_handle1, color);
}
if parent_handle2 != ground_handle && parent_handle2 != sensor_handle {
// FIXME: need a way to access graphics & window in a loop
// graphics.set_body_color(parent_handle2, color);
if let Some(graphics) = &mut graphics {
if parent_handle1 != ground_handle && parent_handle1 != sensor_handle {
graphics.set_body_color(parent_handle1, color);
}
if parent_handle2 != ground_handle && parent_handle2 != sensor_handle {
graphics.set_body_color(parent_handle2, color);
}
}
}
});