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

make examples compile, code that accessed window & graphics via the callback is currently disabled, until that is added back in

Browse Source
This commit is contained in:
rezural
2020-12-31 13:24:29 +11:00
parent d992ebc488
commit f782013947
9 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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, physics, _, graphics, _| { testbed.harness_mut().add_callback(move |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();
@@ -19,7 +19,9 @@ pub fn init_world(testbed: &mut Testbed) {
physics physics
.colliders .colliders
.insert(collider, handle, &mut physics.bodies); .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 let to_remove: Vec<_> = physics
.bodies .bodies
@@ -31,7 +33,9 @@ pub fn init_world(testbed: &mut Testbed) {
physics physics
.bodies .bodies
.remove(handle, &mut physics.colliders, &mut physics.joints); .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);
} }
}); });

2
examples2d/platform2.rs
View File

@@ -60,7 +60,7 @@ pub fn init_world(testbed: &mut Testbed) {
/* /*
* Setup a callback to control the platform. * 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 platform = physics.bodies.get_mut(platform_handle).unwrap();
let mut next_pos = *platform.position(); let mut next_pos = *platform.position();

8
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, graphics, _| { testbed.harness_mut().add_callback(move |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),
@@ -80,10 +80,12 @@ pub fn init_world(testbed: &mut Testbed) {
let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent(); let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent();
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); // TODO: need a way to access graphics & window
// 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); // TODO: need a way to access graphics & window
// graphics.set_body_color(parent_handle2, color);
} }
} }
}); });

6
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, physics, _, graphics, _| { testbed.harness_mut().add_callback(move |physics, _, _, _| {
// Remove then re-add the ground collider. // Remove then re-add the ground collider.
let coll = physics let coll = physics
.colliders .colliders
@@ -43,7 +43,9 @@ pub fn init_world(testbed: &mut Testbed) {
ground_collider_handle = physics ground_collider_handle = physics
.colliders .colliders
.insert(coll, ground_handle, &mut physics.bodies); .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);
}); });
/* /*

9
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, physics, _, graphics, _| { testbed.harness_mut().add_callback(move |physics, _, _, _| {
step += 1; step += 1;
// Add a bigger ball collider // Add a bigger ball collider
@@ -56,7 +56,8 @@ pub fn init_world(testbed: &mut Testbed) {
physics physics
.colliders .colliders
.insert(collider, ball_handle, &mut physics.bodies); .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); extra_colliders.push(new_ball_collider_handle);
// Snap the ball velocity or restore it. // Snap the ball velocity or restore it.
@@ -95,7 +96,9 @@ pub fn init_world(testbed: &mut Testbed) {
physics physics
.colliders .colliders
.insert(coll, ground_handle, &mut physics.bodies); .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); extra_colliders.push(new_ground_collider_handle);
}); });

2
examples3d/debug_rollback3.rs
View File

@@ -44,7 +44,7 @@ pub fn init_world(testbed: &mut Testbed) {
let mut step = 0; let mut step = 0;
let snapped_frame = 51; let snapped_frame = 51;
testbed.add_callback(move |_, physics, _, _, _| { testbed.harness_mut().add_callback(move |physics, _, _, _| {
step += 1; step += 1;
// Snap the ball velocity or restore it. // Snap the ball velocity or restore it.

9
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, physics, _, graphics, _| { testbed.harness_mut().add_callback(move |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)
@@ -41,7 +41,8 @@ pub fn init_world(testbed: &mut Testbed) {
physics physics
.colliders .colliders
.insert(collider, handle, &mut physics.bodies); .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 { if physics.bodies.len() > MAX_NUMBER_OF_BODIES {
let mut to_remove: Vec<_> = physics let mut to_remove: Vec<_> = physics
@@ -67,7 +68,9 @@ pub fn init_world(testbed: &mut Testbed) {
physics physics
.narrow_phase .narrow_phase
.maintain(&mut physics.colliders, &mut physics.bodies); .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);
} }
} }
}); });

2
examples3d/platform3.rs
View File

@@ -65,7 +65,7 @@ pub fn init_world(testbed: &mut Testbed) {
* Setup a callback to control the platform. * Setup a callback to control the platform.
*/ */
let mut count = 0; let mut count = 0;
testbed.add_callback(move |_, physics, _, _, run_state| { testbed.harness_mut().add_callback(move |physics, _, run_state, _| {
count += 1; count += 1;
if count % 100 > 50 { if count % 100 > 50 {
return; return;

8
examples3d/sensor3.rs
View File

@@ -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)); 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, graphics, _| { testbed.harness_mut().add_callback(move |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),
@@ -84,10 +84,12 @@ pub fn init_world(testbed: &mut Testbed) {
let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent(); let parent_handle2 = physics.colliders.get(prox.collider2).unwrap().parent();
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); // TODO: need a way to access graphics & window
// 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); // TODO: need a way to access graphics & window
// graphics.set_body_color(parent_handle2, color);
} }
} }
}); });