aboutsummaryrefslogtreecommitdiff
path: root/src_testbed
diff options
context:
space:
mode:
authorSébastien Crozet <developer@crozet.re>2022-07-10 09:41:57 +0200
committerGitHub <noreply@github.com>2022-07-10 09:41:57 +0200
commitebb9473491858a4621dae7dd2f768fad49ad0ef2 (patch)
tree0e247d21029c36a4775a7020dd59573a490accca /src_testbed
parent573affd73cf8f9d1c998f68535b5832a33c73848 (diff)
parentee10a90f9bb2a1b3c045c41aeb7569123891e757 (diff)
downloadrapier-ebb9473491858a4621dae7dd2f768fad49ad0ef2.tar.gz
rapier-ebb9473491858a4621dae7dd2f768fad49ad0ef2.tar.bz2
rapier-ebb9473491858a4621dae7dd2f768fad49ad0ef2.zip
Merge pull request #365 from dimforge/release-0.14v0.14
Release v0.14
Diffstat (limited to 'src_testbed')
-rw-r--r--src_testbed/box2d_backend.rs2
-rw-r--r--src_testbed/physx_backend.rs16
2 files changed, 14 insertions, 4 deletions
diff --git a/src_testbed/box2d_backend.rs b/src_testbed/box2d_backend.rs
index 2a143fb..9cb4b5f 100644
--- a/src_testbed/box2d_backend.rs
+++ b/src_testbed/box2d_backend.rs
@@ -170,7 +170,7 @@ impl Box2dWorld {
fixture_def.restitution = collider.material().restitution;
fixture_def.friction = collider.material().friction;
- fixture_def.density = collider.density().unwrap_or(1.0);
+ fixture_def.density = collider.density();
fixture_def.is_sensor = collider.is_sensor();
fixture_def.filter = b2::Filter::new();
diff --git a/src_testbed/physx_backend.rs b/src_testbed/physx_backend.rs
index 0a839b9..d4b2a75 100644
--- a/src_testbed/physx_backend.rs
+++ b/src_testbed/physx_backend.rs
@@ -78,10 +78,20 @@ impl IntoPhysx for Point3<f32> {
}
}
+impl IntoPhysx for UnitQuaternion<f32> {
+ type Output = PxQuat;
+ fn into_physx(self) -> Self::Output {
+ PxQuat::new(self.i, self.j, self.k, self.w)
+ }
+}
+
impl IntoPhysx for Isometry3<f32> {
type Output = PxTransform;
fn into_physx(self) -> Self::Output {
- self.into_glam().into()
+ PxTransform::from_translation_rotation(
+ &self.translation.vector.into_physx(),
+ &self.rotation.into_physx(),
+ )
}
}
@@ -164,7 +174,7 @@ impl PhysxWorld {
gravity: gravity.into_physx(),
thread_count: num_threads as u32,
broad_phase_type: BroadPhaseType::AutomaticBoxPruning,
- solver_type: SolverType::PGS,
+ solver_type: SolverType::Pgs,
friction_type,
ccd_max_passes: integration_parameters.max_ccd_substeps as u32,
..SceneDescriptor::new(())
@@ -361,7 +371,7 @@ impl PhysxWorld {
if rb.is_ccd_enabled() {
physx_sys::PxRigidBody_setRigidBodyFlag_mut(
actor,
- RigidBodyFlag::EnableCCD as u32,
+ RigidBodyFlag::EnableCcd as u32,
true,
);
}