diff options
| -rw-r--r-- | examples2d/add_remove2.rs | 10 | ||||
| -rw-r--r-- | examples2d/platform2.rs | 2 | ||||
| -rw-r--r-- | examples2d/sensor2.rs | 8 | ||||
| -rw-r--r-- | examples3d/debug_add_remove_collider3.rs | 6 | ||||
| -rw-r--r-- | examples3d/debug_dynamic_collider_add3.rs | 9 | ||||
| -rw-r--r-- | examples3d/debug_rollback3.rs | 2 | ||||
| -rw-r--r-- | examples3d/fountain3.rs | 9 | ||||
| -rw-r--r-- | examples3d/platform3.rs | 2 | ||||
| -rw-r--r-- | examples3d/sensor3.rs | 8 |
9 files changed, 36 insertions, 20 deletions
diff --git a/examples2d/add_remove2.rs b/examples2d/add_remove2.rs index a3d223d..7ace00f 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, physics, _, graphics, _| { + testbed.harness_mut().add_callback(move |physics, _, _, _| { let rigid_body = RigidBodyBuilder::new_dynamic() .translation(0.0, 10.0) .build(); @@ -19,7 +19,9 @@ pub fn init_world(testbed: &mut Testbed) { physics .colliders .insert(collider, handle, &mut physics.bodies); - graphics.add(window, handle, &physics.bodies, &physics.colliders); + + // TODO: need a way to access graphics & window + // graphics.add(window, handle, &physics.bodies, &physics.colliders); let to_remove: Vec<_> = physics .bodies @@ -31,7 +33,9 @@ pub fn init_world(testbed: &mut Testbed) { physics .bodies .remove(handle, &mut physics.colliders, &mut physics.joints); - graphics.remove_body_nodes(window, handle); + + // TODO: need a way to access graphics & window + // graphics.remove_body_nodes(window, handle); } }); diff --git a/examples2d/platform2.rs b/examples2d/platform2.rs index 3b543db..5b84a18 100644 --- a/examples2d/platform2.rs +++ b/examples2d/platform2.rs @@ -60,7 +60,7 @@ pub fn init_world(testbed: &mut Testbed) { /* * Setup a callback to control the platform. */ - testbed.add_callback(move |_, physics, _, _, run_state| { + testbed.harness_mut().add_callback(move |physics, _, run_state, _| { let platform = physics.bodies.get_mut(platform_handle).unwrap(); let mut next_pos = *platform.position(); diff --git a/examples2d/sensor2.rs b/examples2d/sensor2.rs index 959ecbf..c9edea0 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, graphics, _| { + testbed.harness_mut().add_callback(move |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), @@ -80,10 +80,12 @@ pub fn init_world(testbed: &mut Testbed) { let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent(); if parent_handle1 != ground_handle && parent_handle1 != sensor_handle { - graphics.set_body_color(parent_handle1, color); + // TODO: need a way to access graphics & window + // graphics.set_body_color(parent_handle1, color); } if parent_handle2 != ground_handle && parent_handle2 != sensor_handle { - graphics.set_body_color(parent_handle2, color); + // TODO: need a way to access graphics & window + // graphics.set_body_color(parent_handle2, color); } } }); diff --git a/examples3d/debug_add_remove_collider3.rs b/examples3d/debug_add_remove_collider3.rs index a42dc97..1c59fcf 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, physics, _, graphics, _| { + testbed.harness_mut().add_callback(move |physics, _, _, _| { // Remove then re-add the ground collider. let coll = physics .colliders @@ -43,7 +43,9 @@ pub fn init_world(testbed: &mut Testbed) { ground_collider_handle = physics .colliders .insert(coll, ground_handle, &mut physics.bodies); - graphics.add_collider(window, ground_collider_handle, &physics.colliders); + + // TODO: need a way to access graphics & 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 a71e95e..da33494 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, physics, _, graphics, _| { + testbed.harness_mut().add_callback(move |physics, _, _, _| { step += 1; // Add a bigger ball collider @@ -56,7 +56,8 @@ pub fn init_world(testbed: &mut Testbed) { physics .colliders .insert(collider, ball_handle, &mut physics.bodies); - graphics.add_collider(window, new_ball_collider_handle, &physics.colliders); + // TODO: need a way to access graphics & 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. @@ -95,7 +96,9 @@ pub fn init_world(testbed: &mut Testbed) { physics .colliders .insert(coll, ground_handle, &mut physics.bodies); - graphics.add_collider(window, new_ground_collider_handle, &physics.colliders); + + // TODO: need a way to access graphics & window + // graphics.add_collider(window, new_ground_collider_handle, &physics.colliders); extra_colliders.push(new_ground_collider_handle); }); diff --git a/examples3d/debug_rollback3.rs b/examples3d/debug_rollback3.rs index 19f9474..c3eb684 100644 --- a/examples3d/debug_rollback3.rs +++ b/examples3d/debug_rollback3.rs @@ -44,7 +44,7 @@ pub fn init_world(testbed: &mut Testbed) { let mut step = 0; let snapped_frame = 51; - testbed.add_callback(move |_, physics, _, _, _| { + testbed.harness_mut().add_callback(move |physics, _, _, _| { step += 1; // Snap the ball velocity or restore it. diff --git a/examples3d/fountain3.rs b/examples3d/fountain3.rs index fafa988..8dd12ed 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, physics, _, graphics, _| { + testbed.harness_mut().add_callback(move |physics, _, _, _| { k += 1; let rigid_body = RigidBodyBuilder::new_dynamic() .translation(0.0, 10.0, 0.0) @@ -41,7 +41,8 @@ pub fn init_world(testbed: &mut Testbed) { physics .colliders .insert(collider, handle, &mut physics.bodies); - graphics.add(window, handle, &physics.bodies, &physics.colliders); + // TODO: need a way to access graphics & window + // graphics.add(window, handle, &physics.bodies, &physics.colliders); if physics.bodies.len() > MAX_NUMBER_OF_BODIES { let mut to_remove: Vec<_> = physics @@ -67,7 +68,9 @@ pub fn init_world(testbed: &mut Testbed) { physics .narrow_phase .maintain(&mut physics.colliders, &mut physics.bodies); - graphics.remove_body_nodes(window, *handle); + + // TODO: need a way to access graphics & window + // graphics.remove_body_nodes(window, *handle); } } }); diff --git a/examples3d/platform3.rs b/examples3d/platform3.rs index 1e8d330..82ea8f4 100644 --- a/examples3d/platform3.rs +++ b/examples3d/platform3.rs @@ -65,7 +65,7 @@ pub fn init_world(testbed: &mut Testbed) { * Setup a callback to control the platform. */ let mut count = 0; - testbed.add_callback(move |_, physics, _, _, run_state| { + testbed.harness_mut().add_callback(move |physics, _, run_state, _| { count += 1; if count % 100 > 50 { return; diff --git a/examples3d/sensor3.rs b/examples3d/sensor3.rs index 7b218fe..44c8d25 100644 --- a/examples3d/sensor3.rs +++ b/examples3d/sensor3.rs @@ -73,7 +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 |_, physics, events, graphics, _| { + testbed.harness_mut().add_callback(move |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,10 +84,12 @@ pub fn init_world(testbed: &mut Testbed) { let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent(); if parent_handle1 != ground_handle && parent_handle1 != sensor_handle { - graphics.set_body_color(parent_handle1, color); + // TODO: need a way to access graphics & window + // graphics.set_body_color(parent_handle1, color); } if parent_handle2 != ground_handle && parent_handle2 != sensor_handle { - graphics.set_body_color(parent_handle2, color); + // TODO: need a way to access graphics & window + // graphics.set_body_color(parent_handle2, color); } } }); |