diff options
| author | Crozet Sébastien <developer@crozet.re> | 2020-10-05 16:51:50 +0200 |
|---|---|---|
| committer | Crozet Sébastien <developer@crozet.re> | 2020-10-05 16:52:09 +0200 |
| commit | 2d0a888484dd296cc785caf978252dd97b58e10a (patch) | |
| tree | ae7128730df96ec29cbe402dc67f3228a100f00f | |
| parent | bbfe926a11fdf4f4eb0ddbac0c777a202e07d269 (diff) | |
| download | rapier-2d0a888484dd296cc785caf978252dd97b58e10a.tar.gz rapier-2d0a888484dd296cc785caf978252dd97b58e10a.tar.bz2 rapier-2d0a888484dd296cc785caf978252dd97b58e10a.zip | |
Make the query pipeline serializable.
| -rw-r--r-- | src/dynamics/integration_parameters.rs | 2 | ||||
| -rw-r--r-- | src/pipeline/query_pipeline.rs | 3 | ||||
| -rw-r--r-- | src_testbed/physx_backend.rs | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/dynamics/integration_parameters.rs b/src/dynamics/integration_parameters.rs index faf22e1..b31c3f6 100644 --- a/src/dynamics/integration_parameters.rs +++ b/src/dynamics/integration_parameters.rs @@ -2,7 +2,7 @@ #[derive(Clone)] #[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))] pub struct IntegrationParameters { - /// The timestep (default: `1.0 / 60.0`) + /// The timestep length (default: `1.0 / 60.0`) dt: f32, /// The inverse of `dt`. inv_dt: f32, diff --git a/src/pipeline/query_pipeline.rs b/src/pipeline/query_pipeline.rs index 1a37ad8..ce4e063 100644 --- a/src/pipeline/query_pipeline.rs +++ b/src/pipeline/query_pipeline.rs @@ -6,6 +6,7 @@ use crate::math::{Point, Vector}; use ncollide::bounding_volume::BoundingVolume; /// A pipeline for performing queries on all the colliders of a scene. +#[cfg_attr(feature = "serde-serialize", derive(Serialize, Deserialize))] pub struct QueryPipeline { quadtree: WQuadtree, tree_built: bool, @@ -65,7 +66,7 @@ impl QueryPipeline { // let t0 = instant::now(); let inter = self.quadtree.cast_ray(ray, max_toi); // println!( - // "Found {} interefrences in time {}.", + // "Found {} interferences in time {}.", // inter.len(), // instant::now() - t0 // ); diff --git a/src_testbed/physx_backend.rs b/src_testbed/physx_backend.rs index 8131b37..ec2e2bf 100644 --- a/src_testbed/physx_backend.rs +++ b/src_testbed/physx_backend.rs @@ -261,10 +261,10 @@ impl PhysxWorld { fn setup_joints(&mut self, joints: &JointSet) { unsafe { for joint in joints.iter() { - let actor1 = self.rapier2physx[&joint.body1]; - let actor2 = self.rapier2physx[&joint.body2]; + let actor1 = self.rapier2physx[&joint.1.body1]; + let actor2 = self.rapier2physx[&joint.1.body2]; - match &joint.params { + match &joint.1.params { JointParams::BallJoint(params) => { let frame1 = physx::transform::gl_to_px_tf( Isometry3::new(params.local_anchor1.coords, na::zero()).into_glam(), |