Merge branch 'master' into split_geom

# Conflicts:
#	examples2d/sensor2.rs
#	examples3d/sensor3.rs
#	src/dynamics/integration_parameters.rs
#	src/dynamics/solver/parallel_island_solver.rs
#	src/dynamics/solver/velocity_constraint.rs
#	src/dynamics/solver/velocity_ground_constraint.rs
#	src_testbed/nphysics_backend.rs
#	src_testbed/physx_backend.rs
#	src_testbed/testbed.rs
This commit is contained in:
Crozet Sébastien
2021-01-22 16:10:24 +01:00
24 changed files with 359 additions and 356 deletions

View File

@@ -219,7 +219,7 @@ impl Box2dWorld {
counters.step_started();
self.world.step(
params.dt(),
params.dt,
params.max_velocity_iterations as i32,
params.max_position_iterations as i32,
);