diff options
| -rw-r--r-- | examples2d/add_remove2.rs | 15 | ||||
| -rw-r--r-- | examples2d/sensor2.rs | 17 | ||||
| -rw-r--r-- | examples3d/debug_add_remove_collider3.rs | 11 | ||||
| -rw-r--r-- | examples3d/debug_dynamic_collider_add3.rs | 18 | ||||
| -rw-r--r-- | examples3d/fountain3.rs | 14 | ||||
| -rw-r--r-- | examples3d/sensor3.rs | 18 |
6 files changed, 37 insertions, 56 deletions
diff --git a/examples2d/add_remove2.rs b/examples2d/add_remove2.rs index cb71025..0aeffbe 100644 --- a/examples2d/add_remove2.rs +++ b/examples2d/add_remove2.rs @@ -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); + } } }); diff --git a/examples2d/sensor2.rs b/examples2d/sensor2.rs index 9fdbf14..3d5976d 100644 --- a/examples2d/sensor2.rs +++ b/examples2d/sensor2.rs @@ -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); + } } } }); diff --git a/examples3d/debug_add_remove_collider3.rs b/examples3d/debug_add_remove_collider3.rs index 8a3d672..f353162 100644 --- a/examples3d/debug_add_remove_collider3.rs +++ b/examples3d/debug_add_remove_collider3.rs @@ -34,7 +34,7 @@ pub fn init_world(testbed: &mut Testbed) { let collider = ColliderBuilder::ball(ball_rad).density(100.0).build(); colliders.insert(collider, ball_handle, &mut bodies); - testbed.add_callback(move |window, graphics, physics, _, _| { + testbed.add_callback(move |mut window, mut graphics, physics, _, _| { // Remove then re-add the ground collider. let coll = physics .colliders @@ -44,13 +44,8 @@ pub fn init_world(testbed: &mut Testbed) { .colliders .insert(coll, ground_handle, &mut physics.bodies); - // TODO: need a way to access graphics & window - if graphics.is_some() { - graphics.unwrap().add_collider( - window.unwrap(), - ground_collider_handle, - &physics.colliders, - ); + if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) { + graphics.add_collider(window, ground_collider_handle, &physics.colliders); } }); diff --git a/examples3d/debug_dynamic_collider_add3.rs b/examples3d/debug_dynamic_collider_add3.rs index cefe030..bd7205e 100644 --- a/examples3d/debug_dynamic_collider_add3.rs +++ b/examples3d/debug_dynamic_collider_add3.rs @@ -45,7 +45,7 @@ pub fn init_world(testbed: &mut Testbed) { let mut extra_colliders = Vec::new(); let snapped_frame = 51; - testbed.add_callback(move |window, graphics, physics, _, _| { + testbed.add_callback(move |mut window, mut graphics, physics, _, _| { step += 1; // Add a bigger ball collider @@ -57,13 +57,10 @@ pub fn init_world(testbed: &mut Testbed) { .colliders .insert(collider, ball_handle, &mut physics.bodies); - if graphics.is_some() { - graphics.unwrap().add_collider( - window.unwrap(), - new_ball_collider_handle, - &physics.colliders, - ); + if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) { + graphics.add_collider(window, new_ball_collider_handle, &physics.colliders); } + extra_colliders.push(new_ball_collider_handle); // Snap the ball velocity or restore it. @@ -103,10 +100,9 @@ pub fn init_world(testbed: &mut Testbed) { .colliders .insert(coll, ground_handle, &mut physics.bodies); - //FIXME: This causes an error - // if graphics.is_some() { - // graphics.unwrap().add_collider(window.unwrap(), new_ground_collider_handle, &physics.colliders); - // } + if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) { + graphics.add_collider(window, new_ground_collider_handle, &physics.colliders); + } extra_colliders.push(new_ground_collider_handle); }); diff --git a/examples3d/fountain3.rs b/examples3d/fountain3.rs index e42f71a..5acc2e8 100644 --- a/examples3d/fountain3.rs +++ b/examples3d/fountain3.rs @@ -26,7 +26,7 @@ pub fn init_world(testbed: &mut Testbed) { let mut k = 0; // 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, _, _| { k += 1; let rigid_body = RigidBodyBuilder::new_dynamic() .translation(0.0, 10.0, 0.0) @@ -42,10 +42,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); } if physics.bodies.len() > MAX_NUMBER_OF_BODIES { @@ -73,9 +71,9 @@ pub fn init_world(testbed: &mut Testbed) { .narrow_phase .maintain(&mut physics.colliders, &mut physics.bodies); - // 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); + } } } }); diff --git a/examples3d/sensor3.rs b/examples3d/sensor3.rs index 37a8f5a..4160248 100644 --- a/examples3d/sensor3.rs +++ b/examples3d/sensor3.rs @@ -73,8 +73,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 |_, graphics, physics, events, _| { - let graphics = &graphics; + 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), @@ -84,16 +83,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(); - match graphics { - Some(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); - } + 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); } - None => {} } } }); |