From cc6d1b973002b4d366bc81ec6bf9e8240ad7b404 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Mon, 14 Dec 2020 15:51:43 +0100 Subject: Outsource the Shape trait, wquadtree, and shape types. --- src/lib.rs | 140 +------------------------------------------------------------ 1 file changed, 1 insertion(+), 139 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index ed9eda5..0cd76a1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -53,14 +53,6 @@ macro_rules! array( #[allow(dead_code)] fn create_arr(mut callback: impl FnMut(usize) -> T) -> [T; SIMD_WIDTH] { [callback(0usize), callback(1usize), callback(2usize), callback(3usize)] - - // [callback(0usize), callback(1usize), callback(2usize), callback(3usize), - // callback(4usize), callback(5usize), callback(6usize), callback(7usize)] - - // [callback(0usize), callback(1usize), callback(2usize), callback(3usize), - // callback(4usize), callback(5usize), callback(6usize), callback(7usize), - // callback(8usize), callback(9usize), callback(10usize), callback(11usize), - // callback(12usize), callback(13usize), callback(14usize), callback(15usize)] } create_arr($callback) @@ -136,134 +128,4 @@ pub mod dynamics; pub mod geometry; pub mod pipeline; pub mod utils; - -#[cfg(feature = "dim2")] -/// Math primitives used throughout Rapier. -pub mod math { - pub use super::simd::*; - use na::{Isometry2, Matrix2, Point2, Translation2, UnitComplex, Vector2, Vector3, U1, U2}; - - /// The dimension of the physics simulated by this crate. - pub const DIM: usize = 2; - /// The maximum number of point a contact manifold can hold. - pub const MAX_MANIFOLD_POINTS: usize = 2; - /// The dimension of the physics simulated by this crate, given as a type-level-integer. - pub type Dim = U2; - /// The maximum number of angular degrees of freedom of a rigid body given as a type-level-integer. - pub type AngDim = U1; - /// A 2D isometry, i.e., a rotation followed by a translation. - pub type Isometry = Isometry2; - /// A 2D vector. - pub type Vector = Vector2; - /// A scalar used for angular velocity. - /// - /// This is called `AngVector` for coherence with the 3D version of this crate. - pub type AngVector = N; - /// A 2D point. - pub type Point = Point2; - /// A 2D rotation expressed as an unit complex number. - pub type Rotation = UnitComplex; - /// A 2D translation. - pub type Translation = Translation2; - /// The angular inertia of a rigid body. - pub type AngularInertia = N; - /// The principal angular inertia of a rigid body. - pub type PrincipalAngularInertia = N; - /// A matrix that represent the cross product with a given vector. - pub type CrossMatrix = Vector2; - /// A 2x2 matrix. - pub type Matrix = Matrix2; - /// A vector with a dimension equal to the maximum number of degrees of freedom of a rigid body. - pub type SpacialVector = Vector3; - /// A 2D symmetric-definite-positive matrix. - pub type SdpMatrix = crate::utils::SdpMatrix2; -} - -#[cfg(feature = "dim3")] -/// Math primitives used throughout Rapier. -pub mod math { - pub use super::simd::*; - use na::{Isometry3, Matrix3, Point3, Translation3, UnitQuaternion, Vector3, Vector6, U3}; - - /// The dimension of the physics simulated by this crate. - pub const DIM: usize = 3; - /// The maximum number of point a contact manifold can hold. - pub const MAX_MANIFOLD_POINTS: usize = 4; - /// The dimension of the physics simulated by this crate, given as a type-level-integer. - pub type Dim = U3; - /// The maximum number of angular degrees of freedom of a rigid body given as a type-level-integer. - pub type AngDim = U3; - /// A 3D isometry, i.e., a rotation followed by a translation. - pub type Isometry = Isometry3; - /// A 3D vector. - pub type Vector = Vector3; - /// An axis-angle vector used for angular velocity. - pub type AngVector = Vector3; - /// A 3D point. - pub type Point = Point3; - /// A 3D rotation expressed as an unit quaternion. - pub type Rotation = UnitQuaternion; - /// A 3D translation. - pub type Translation = Translation3; - /// The angular inertia of a rigid body. - pub type AngularInertia = crate::utils::SdpMatrix3; - /// The principal angular inertia of a rigid body. - pub type PrincipalAngularInertia = Vector3; - /// A matrix that represent the cross product with a given vector. - pub type CrossMatrix = Matrix3; - /// A 3x3 matrix. - pub type Matrix = Matrix3; - /// A vector with a dimension equal to the maximum number of degrees of freedom of a rigid body. - pub type SpacialVector = Vector6; - /// A 3D symmetric-definite-positive matrix. - pub type SdpMatrix = crate::utils::SdpMatrix3; -} - -#[cfg(not(feature = "simd-is-enabled"))] -mod simd { - use simba::simd::{AutoBoolx4, AutoF32x4}; - /// The number of lanes of a SIMD number. - pub const SIMD_WIDTH: usize = 4; - /// SIMD_WIDTH - 1 - pub const SIMD_LAST_INDEX: usize = 3; - /// A SIMD float with SIMD_WIDTH lanes. - pub type SimdFloat = AutoF32x4; - /// A SIMD bool with SIMD_WIDTH lanes. - pub type SimdBool = AutoBoolx4; -} - -#[cfg(feature = "simd-is-enabled")] -mod simd { - #[allow(unused_imports)] - #[cfg(feature = "simd-nightly")] - use simba::simd::{f32x16, f32x4, f32x8, m32x16, m32x4, m32x8, u8x16, u8x4, u8x8}; - #[cfg(feature = "simd-stable")] - use simba::simd::{WideBoolF32x4, WideF32x4}; - - /// The number of lanes of a SIMD number. - pub const SIMD_WIDTH: usize = 4; - /// SIMD_WIDTH - 1 - pub const SIMD_LAST_INDEX: usize = 3; - #[cfg(not(feature = "simd-nightly"))] - /// A SIMD float with SIMD_WIDTH lanes. - pub type SimdFloat = WideF32x4; - #[cfg(not(feature = "simd-nightly"))] - /// A SIMD bool with SIMD_WIDTH lanes. - pub type SimdBool = WideBoolF32x4; - #[cfg(feature = "simd-nightly")] - /// A SIMD float with SIMD_WIDTH lanes. - pub type SimdFloat = f32x4; - #[cfg(feature = "simd-nightly")] - /// A bool float with SIMD_WIDTH lanes. - pub type SimdBool = m32x4; - - // pub const SIMD_WIDTH: usize = 8; - // pub const SIMD_LAST_INDEX: usize = 7; - // pub type SimdFloat = f32x8; - // pub type SimdBool = m32x8; - - // pub const SIMD_WIDTH: usize = 16; - // pub const SIMD_LAST_INDEX: usize = 15; - // pub type SimdFloat = f32x16; - // pub type SimdBool = m32x16; -} +pub use buckler::math; -- cgit