enable graphics and windows related code in examples

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

View File

@@ -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);
});