add rkyv-safe-deser feature for deriving CheckBytes on Archive types

crates/parry2d-f64/Cargo.toml

@@ -24,6 +24,7 @@ dim2    = [ ]
 f64     = [ ]
 serde-serialize = [ "serde", "nalgebra/serde-serialize", "arrayvec/serde" ]
 rkyv-serialize = [ "rkyv", "nalgebra/rkyv-serialize", "simba/rkyv-serialize" ]
+rkyv-safe-deser = [ "rkyv-serialize", "rkyv/validation" ]
 bytemuck-serialize = [ "bytemuck", "nalgebra/convert-bytemuck" ]
 simd-stable = [ "simba/wide", "simd-is-enabled" ]
 simd-nightly = [ "simba/packed_simd", "simd-is-enabled" ]
@@ -52,7 +53,7 @@ simba           = { version = "0.8", default-features = false }
 nalgebra        = { version = "0.32", default-features = false, features = [ "libm" ] }
 approx          = { version = "0.5", default-features = false }
 serde           = { version = "1.0", optional = true, features = ["derive"] }
-rkyv            = { version = "0.7", optional = true }
+rkyv            = { version = "0.7.41", optional = true }
 num-derive      = "0.3"
 indexmap        = { version = "1", features = [ "serde-1" ], optional = true }
 rustc-hash      = { version = "1", optional = true }

crates/parry2d/Cargo.toml

@@ -24,6 +24,7 @@ dim2    = [ ]
 f32     = [ ]
 serde-serialize = [ "serde", "nalgebra/serde-serialize", "arrayvec/serde" ]
 rkyv-serialize = [ "rkyv", "nalgebra/rkyv-serialize", "simba/rkyv-serialize" ]
+rkyv-safe-deser = [ "rkyv-serialize", "rkyv/validation" ]
 bytemuck-serialize = [ "bytemuck", "nalgebra/convert-bytemuck" ]
 simd-stable = [ "simba/wide", "simd-is-enabled" ]
 simd-nightly = [ "simba/packed_simd", "simd-is-enabled" ]
@@ -52,7 +53,7 @@ simba           = { version = "0.8", default-features = false }
 nalgebra        = { version = "0.32", default-features = false, features = [ "libm" ] }
 approx          = { version = "0.5", default-features = false }
 serde           = { version = "1.0", optional = true, features = ["derive"] }
-rkyv            = { version = "0.7", optional = true }
+rkyv            = { version = "0.7.41", optional = true }
 num-derive      = "0.3"
 indexmap        = { version = "1", features = [ "serde-1" ], optional = true }
 rustc-hash      = { version = "1", optional = true }

crates/parry3d-f64/Cargo.toml

@@ -24,6 +24,7 @@ dim3    = [ ]
 f64     = [ ]
 serde-serialize = [ "serde", "nalgebra/serde-serialize" ]
 rkyv-serialize = [ "rkyv", "nalgebra/rkyv-serialize", "simba/rkyv-serialize" ]
+rkyv-safe-deser = [ "rkyv-serialize", "rkyv/validation" ]
 bytemuck-serialize = [ "bytemuck", "nalgebra/convert-bytemuck" ]
 simd-stable = [ "simba/wide", "simd-is-enabled" ]
 simd-nightly = [ "simba/packed_simd", "simd-is-enabled" ]
@@ -52,7 +53,7 @@ simba      = { version = "0.8", default-features = false }
 nalgebra   = { version = "0.32", default-features = false, features = [ "libm" ] }
 approx     = { version = "0.5", default-features = false }
 serde      = { version = "1.0", optional = true, features = ["derive", "rc"]}
-rkyv       = { version = "0.7", optional = true }
+rkyv       = { version = "0.7.41", optional = true }
 num-derive = "0.3"
 indexmap   = { version = "1", features = [ "serde-1" ], optional = true }
 rustc-hash = { version = "1", optional = true }

crates/parry3d/Cargo.toml

@@ -24,6 +24,7 @@ dim3    = [ ]
 f32     = [ ]
 serde-serialize = [ "serde", "nalgebra/serde-serialize" ]
 rkyv-serialize = [ "rkyv", "nalgebra/rkyv-serialize", "simba/rkyv-serialize" ]
+rkyv-safe-deser = [ "rkyv-serialize", "rkyv/validation" ]
 bytemuck-serialize = [ "bytemuck", "nalgebra/convert-bytemuck" ]
 
 simd-stable = [ "simba/wide", "simd-is-enabled" ]
@@ -53,7 +54,7 @@ simba      = { version = "0.8", default-features = false }
 nalgebra   = { version = "0.32", default-features = false, features = [ "libm" ] }
 approx     = { version = "0.5", default-features = false }
 serde      = { version = "1.0", optional = true, features = ["derive", "rc"]}
-rkyv       = { version = "0.7", optional = true }
+rkyv       = { version = "0.7.41", optional = true }
 num-derive = "0.3"
 indexmap   = { version = "1", features = [ "serde-1" ], optional = true }
 rustc-hash = { version = "1", optional = true }

src/bounding_volume/aabb.rs

@@ -19,6 +19,7 @@ use na::ComplexField; // for .abs()
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 #[derive(Debug, PartialEq, Copy, Clone)]
 #[repr(C)]

src/bounding_volume/bounding_sphere.rs

@@ -13,6 +13,7 @@ use num::Zero;
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Debug, PartialEq, Copy, Clone)]
 #[repr(C)]
 pub struct BoundingSphere {

src/bounding_volume/simd_aabb.rs

@@ -11,6 +11,7 @@ use simba::simd::{SimdPartialOrd, SimdValue};
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 pub struct SimdAabb {
     /// The min coordinates of the Aabbs.

src/mass_properties/mass_properties.rs

@@ -15,6 +15,7 @@ const EPSILON: Real = f32::EPSILON as Real;
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 /// The local mass properties of a rigid-body.
 pub struct MassProperties {
     /// The center of mass of a rigid-body expressed in its local-space.

src/partitioning/qbvh/qbvh.rs

@@ -62,6 +62,7 @@ pub type SimdNodeIndex = u32;
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 /// The index of one specific node of a Qbvh.
 pub struct NodeIndex {
@@ -117,6 +118,7 @@ bitflags! {
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 pub struct QbvhNode {
     /// The Aabbs of the qbvh nodes represented by this node.
@@ -190,6 +192,7 @@ impl QbvhNode {
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 /// Combination of a leaf data and its associated node’s index.
 pub struct QbvhProxy<LeafData> {
@@ -230,6 +233,7 @@ impl<LeafData> QbvhProxy<LeafData> {
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[repr(C)] // Needed for Cuda.
 #[derive(Debug)]
 pub struct GenericQbvh<LeafData, Storage: QbvhStorage<LeafData>> {

src/query/closest_points/closest_points.rs

@@ -9,6 +9,7 @@ use std::mem;
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 pub enum ClosestPoints {
     /// The two objects are intersecting.
     Intersecting,

src/query/contact/contact.rs

@@ -10,6 +10,7 @@ use std::mem;
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 pub struct Contact {
     /// Position of the contact on the first object.
     pub point1: Point<Real>,

src/query/contact_manifolds/contact_manifold.rs

@@ -7,6 +7,7 @@ use crate::shape::PackedFeatureId;
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 /// A single contact between two shape.
 pub struct TrackedContact<Data> {
     /// The contact point in the local-space of the first shape.

src/query/contact_manifolds/contact_manifolds_composite_shape_composite_shape.rs

@@ -16,6 +16,7 @@ use crate::utils::IsometryOpt;
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Clone)]
 struct SubDetector {
     manifold_id: usize,

src/query/contact_manifolds/contact_manifolds_composite_shape_shape.rs

@@ -16,6 +16,7 @@ use crate::utils::IsometryOpt;
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Clone)]
 struct SubDetector {
     manifold_id: usize,

src/query/contact_manifolds/contact_manifolds_heightfield_composite_shape.rs

@@ -21,6 +21,7 @@ use crate::query::contact_manifolds::InternalEdgesFixer;
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Clone)]
 struct SubDetector {
     manifold_id: usize,

src/query/contact_manifolds/contact_manifolds_heightfield_shape.rs

@@ -19,6 +19,7 @@ use crate::query::contact_manifolds::InternalEdgesFixer;
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Clone)]
 struct SubDetector {
     manifold_id: usize,

src/query/contact_manifolds/contact_manifolds_trimesh_shape.rs

@@ -13,6 +13,7 @@ use crate::shape::{Shape, TriMesh};
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Clone)]
 pub struct TriMeshShapeContactManifoldsWorkspace {
     interferences: Vec<u32>,

src/query/contact_manifolds/internal_edges_fixer.rs

@@ -10,6 +10,7 @@ use crate::math::Real;
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Default, Clone)]
 #[allow(dead_code)] // We will need these for 2D too in the future.
 pub struct InternalEdgesFixer {

src/query/point/point_query.rs

@@ -10,6 +10,7 @@ use na;
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 pub struct PointProjection {
     /// Whether or not the point to project was inside of the shape.
     pub is_inside: bool,

src/query/ray/ray.rs

@@ -11,6 +11,7 @@ use crate::shape::FeatureId;
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 #[repr(C)]
 pub struct Ray {
@@ -64,6 +65,7 @@ impl Ray {
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 pub struct RayIntersection {
     /// The time of impact of the ray with the object.  The exact contact point can be computed
     /// with: `ray.point_at(toi)` or equivalently `origin + dir * toi` where `origin` is the origin of the ray;

src/shape/ball.rs

@@ -8,10 +8,11 @@ use crate::shape::SupportMap;
 /// A Ball shape.
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "bytemuck", derive(bytemuck::Pod, bytemuck::Zeroable))]
-// #[cfg_attr(
-//     feature = "rkyv",
-//     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
-// )]
+#[cfg_attr(
+    feature = "rkyv",
+    derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
+)]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 #[derive(PartialEq, Debug, Copy, Clone)]
 #[repr(C)]

src/shape/capsule.rs

@@ -13,6 +13,7 @@ use either::Either;
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 #[repr(C)]
 /// A capsule shape defined as a round segment.

src/shape/cone.rs

@@ -19,6 +19,7 @@ use na::RealField; // for .copysign()
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 #[derive(PartialEq, Debug, Copy, Clone)]
 #[repr(C)]

src/shape/convex_polygon.rs

@@ -9,6 +9,7 @@ use na::{self, ComplexField, RealField, Unit};
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Clone, Debug)]
 pub struct ConvexPolygon {
     points: Vec<Point<Real>>,

src/shape/convex_polyhedron.rs

@@ -15,6 +15,7 @@ use na::ComplexField; // for .abs()
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(PartialEq, Debug, Copy, Clone)]
 pub struct Vertex {
     pub first_adj_face_or_edge: u32,
@@ -27,6 +28,7 @@ pub struct Vertex {
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(PartialEq, Debug, Copy, Clone)]
 pub struct Edge {
     pub vertices: Point2<u32>,
@@ -51,6 +53,7 @@ impl Edge {
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(PartialEq, Debug, Copy, Clone)]
 pub struct Face {
     pub first_vertex_or_edge: u32,
@@ -63,6 +66,7 @@ pub struct Face {
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(PartialEq, Debug, Copy, Clone)]
 struct Triangle {
     vertices: [u32; 3],
@@ -89,6 +93,7 @@ impl Triangle {
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(PartialEq, Debug, Clone)]
 /// A convex polyhedron without degenerate faces.
 pub struct ConvexPolyhedron {

src/shape/cuboid.rs

@@ -18,6 +18,7 @@ use na::RealField; // for .copysign()
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 #[derive(PartialEq, Debug, Copy, Clone)]
 #[repr(C)]

src/shape/cylinder.rs

@@ -19,6 +19,7 @@ use na::RealField; // for .copysign()
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 #[derive(PartialEq, Debug, Copy, Clone)]
 #[repr(C)]

src/shape/feature_id.rs

@@ -9,6 +9,7 @@
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
 pub enum FeatureId {
     /// Shape-dependent identifier of a vertex.
@@ -62,6 +63,7 @@ impl FeatureId {
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
 /// A feature id where the feature type is packed into the same value as the feature index.
 pub struct PackedFeatureId(pub u32);

src/shape/half_space.rs

@@ -10,6 +10,7 @@ use na::Unit;
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
     archive(as = "Self")
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 #[repr(C)]
 pub struct HalfSpace {

src/shape/heightfield2.rs

@@ -55,6 +55,7 @@ impl HeightFieldStorage for CudaStoragePtr {
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Debug)]
 #[repr(C)] // Needed for Cuda.
 /// A 2D heightfield with a generic storage buffer for its heights.

src/shape/heightfield3.rs

@@ -24,6 +24,7 @@ bitflags! {
         derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize),
         archive(as = "Self")
     )]
+    #[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
     #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
     #[derive(Default)]
     /// The status of the cell of an heightfield.
@@ -70,6 +71,7 @@ impl HeightFieldStorage for CudaStoragePtr {
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[derive(Debug)]
 #[repr(C)] // Needed for Cuda.
 /// A 3D heightfield with a generic storage buffer for its height grid.

src/shape/polygon.rs

@@ -9,6 +9,7 @@ use parry::bounding_volume::Aabb;
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 /// A convex planar polygon.
 pub struct Polygon {
     pub(crate) vertices: Vec<Point<Real>>,

src/shape/polyline.rs

@@ -15,6 +15,7 @@ use na::ComplexField; // for .abs()
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 /// A polyline.
 pub struct Polyline {
     qbvh: Qbvh<u32>,

src/shape/round_shape.rs

@@ -7,6 +7,7 @@ use na::Unit;
     feature = "rkyv",
     derive(rkyv::Archive, rkyv::Deserialize, rkyv::Serialize)
 )]
+#[cfg_attr(feature = "rkyv-safe-deser", archive(check_bytes))]
 #[cfg_attr(feature = "cuda", derive(cust_core::DeviceCopy))]
 #[derive(Copy, Clone, Debug)]
 #[repr(C)]