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; let rad = 0.5;
// 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.add_callback(move |window, graphics, physics, _, _| { testbed.add_callback(move |mut window, mut graphics, physics, _, _| {
let rigid_body = RigidBodyBuilder::new_dynamic() let rigid_body = RigidBodyBuilder::new_dynamic()
.translation(0.0, 10.0) .translation(0.0, 10.0)
.build(); .build();
@@ -20,10 +20,8 @@ pub fn init_world(testbed: &mut Testbed) {
.colliders .colliders
.insert(collider, handle, &mut physics.bodies); .insert(collider, handle, &mut physics.bodies);
if graphics.is_some() { if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
graphics graphics.add(*window, handle, &physics.bodies, &physics.colliders);
.unwrap()
.add(window.unwrap(), handle, &physics.bodies, &physics.colliders);
} }
let to_remove: Vec<_> = physics let to_remove: Vec<_> = physics
@@ -37,10 +35,9 @@ pub fn init_world(testbed: &mut Testbed) {
.bodies .bodies
.remove(handle, &mut physics.colliders, &mut physics.joints); .remove(handle, &mut physics.colliders, &mut physics.joints);
// FIXME: need a way to access graphics & window in a loop if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
// if graphics.is_some() { graphics.remove_body_nodes(*window, handle);
// graphics.unwrap().remove_body_nodes(window.unwrap(), 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)); 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.add_callback(move |_, _, physics, events, _| { testbed.add_callback(move |_, mut graphics, physics, events, _| {
while let Ok(prox) = events.proximity_events.try_recv() { while let Ok(prox) = events.proximity_events.try_recv() {
let color = match prox.new_status { let color = match prox.new_status {
Proximity::WithinMargin | Proximity::Intersecting => Point3::new(1.0, 1.0, 0.0), 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_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 let Some(graphics) = &mut graphics {
if parent_handle1 != ground_handle && parent_handle1 != sensor_handle { 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);
// graphics.set_body_color(parent_handle1, color); }
} if parent_handle2 != ground_handle && parent_handle2 != sensor_handle {
if parent_handle2 != ground_handle && parent_handle2 != sensor_handle { graphics.set_body_color(parent_handle2, color);
// FIXME: need a way to access graphics & window in a loop }
// graphics.set_body_color(parent_handle2, color);
} }
} }
}); });

11
examples3d/debug_add_remove_collider3.rs
View File

@@ -34,7 +34,7 @@ pub fn init_world(testbed: &mut Testbed) {
let collider = ColliderBuilder::ball(ball_rad).density(100.0).build(); let collider = ColliderBuilder::ball(ball_rad).density(100.0).build();
colliders.insert(collider, ball_handle, &mut bodies); 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. // Remove then re-add the ground collider.
let coll = physics let coll = physics
.colliders .colliders
@@ -44,13 +44,8 @@ pub fn init_world(testbed: &mut Testbed) {
.colliders .colliders
.insert(coll, ground_handle, &mut physics.bodies); .insert(coll, ground_handle, &mut physics.bodies);
// TODO: need a way to access graphics & window if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
if graphics.is_some() { graphics.add_collider(window, ground_collider_handle, &physics.colliders);
graphics.unwrap().add_collider(
window.unwrap(),
ground_collider_handle,
&physics.colliders,
);
} }
}); });

18
examples3d/debug_dynamic_collider_add3.rs
View File

@@ -45,7 +45,7 @@ pub fn init_world(testbed: &mut Testbed) {
let mut extra_colliders = Vec::new(); let mut extra_colliders = Vec::new();
let snapped_frame = 51; let snapped_frame = 51;
testbed.add_callback(move |window, graphics, physics, _, _| { testbed.add_callback(move |mut window, mut graphics, physics, _, _| {
step += 1; step += 1;
// Add a bigger ball collider // Add a bigger ball collider
@@ -57,13 +57,10 @@ pub fn init_world(testbed: &mut Testbed) {
.colliders .colliders
.insert(collider, ball_handle, &mut physics.bodies); .insert(collider, ball_handle, &mut physics.bodies);
if graphics.is_some() { if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
graphics.unwrap().add_collider( graphics.add_collider(window, new_ball_collider_handle, &physics.colliders);
window.unwrap(),
new_ball_collider_handle,
&physics.colliders,
);
} }
extra_colliders.push(new_ball_collider_handle); extra_colliders.push(new_ball_collider_handle);
// Snap the ball velocity or restore it. // Snap the ball velocity or restore it.
@@ -103,10 +100,9 @@ pub fn init_world(testbed: &mut Testbed) {
.colliders .colliders
.insert(coll, ground_handle, &mut physics.bodies); .insert(coll, ground_handle, &mut physics.bodies);
//FIXME: This causes an error if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
// if graphics.is_some() { graphics.add_collider(window, new_ground_collider_handle, &physics.colliders);
// graphics.unwrap().add_collider(window.unwrap(), new_ground_collider_handle, &physics.colliders); }
// }
extra_colliders.push(new_ground_collider_handle); extra_colliders.push(new_ground_collider_handle);
}); });

14
examples3d/fountain3.rs
View File

@@ -26,7 +26,7 @@ pub fn init_world(testbed: &mut Testbed) {
let mut k = 0; let mut k = 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.add_callback(move |window, graphics, physics, _, _| { testbed.add_callback(move |mut window, mut graphics, physics, _, _| {
k += 1; k += 1;
let rigid_body = RigidBodyBuilder::new_dynamic() let rigid_body = RigidBodyBuilder::new_dynamic()
.translation(0.0, 10.0, 0.0) .translation(0.0, 10.0, 0.0)
@@ -42,10 +42,8 @@ pub fn init_world(testbed: &mut Testbed) {
.colliders .colliders
.insert(collider, handle, &mut physics.bodies); .insert(collider, handle, &mut physics.bodies);
if graphics.is_some() { if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
graphics graphics.add(window, handle, &physics.bodies, &physics.colliders);
.unwrap()
.add(window.unwrap(), handle, &physics.bodies, &physics.colliders);
} }
if physics.bodies.len() > MAX_NUMBER_OF_BODIES { if physics.bodies.len() > MAX_NUMBER_OF_BODIES {
@@ -73,9 +71,9 @@ pub fn init_world(testbed: &mut Testbed) {
.narrow_phase .narrow_phase
.maintain(&mut physics.colliders, &mut physics.bodies); .maintain(&mut physics.colliders, &mut physics.bodies);
// if graphics.is_some() { if let (Some(graphics), Some(window)) = (&mut graphics, &mut window) {
// graphics.unwrap().remove_body_nodes(window.unwrap(), *handle); graphics.remove_body_nodes(window, *handle);
// } }
} }
} }
}); });

18
examples3d/sensor3.rs
View File

@@ -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)); 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.add_callback(move |_, graphics, physics, events, _| { testbed.add_callback(move |_, mut graphics, physics, events, _| {
let graphics = &graphics;
while let Ok(prox) = events.proximity_events.try_recv() { while let Ok(prox) = events.proximity_events.try_recv() {
let color = match prox.new_status { let color = match prox.new_status {
Proximity::WithinMargin | Proximity::Intersecting => Point3::new(1.0, 1.0, 0.0), 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_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();
match graphics { if let Some(graphics) = &mut graphics {
Some(graphics) => { if parent_handle1 != ground_handle && parent_handle1 != sensor_handle {
if parent_handle1 != ground_handle && parent_handle1 != sensor_handle { graphics.set_body_color(parent_handle1, color);
// graphics.set_body_color(parent_handle1, color); }
} if parent_handle2 != ground_handle && parent_handle2 != sensor_handle {
if parent_handle2 != ground_handle && parent_handle2 != sensor_handle { graphics.set_body_color(parent_handle2, color);
// graphics.set_body_color(parent_handle2, color);
}
} }
None => {}
} }
} }
}); });