From 59e5d8e7f9151f9a3ba06c1c6414aa4ffc19fa4d Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Thu, 3 Jun 2021 09:57:56 +0200 Subject: Add nalgebra to the prelude to make the macros work out of the box --- benchmarks2d/Cargo.toml | 1 - benchmarks2d/all_benchmarks2.rs | 2 -- benchmarks2d/heightfield2.rs | 2 +- benchmarks3d/Cargo.toml | 1 - benchmarks3d/all_benchmarks3.rs | 2 -- benchmarks3d/heightfield3.rs | 2 +- benchmarks3d/trimesh3.rs | 2 +- examples2d/Cargo.toml | 1 - examples2d/all_examples2.rs | 2 -- examples2d/heightfield2.rs | 2 +- examples2d/polyline2.rs | 2 +- examples3d/Cargo.toml | 1 - examples3d/all_examples3.rs | 2 -- examples3d/all_examples3_wasm.rs | 2 -- examples3d/convex_decomposition3.rs | 2 +- examples3d/heightfield3.rs | 2 +- examples3d/trimesh3.rs | 2 +- src/lib.rs | 1 + 18 files changed, 9 insertions(+), 22 deletions(-) diff --git a/benchmarks2d/Cargo.toml b/benchmarks2d/Cargo.toml index 92e2959..c7c775d 100644 --- a/benchmarks2d/Cargo.toml +++ b/benchmarks2d/Cargo.toml @@ -14,7 +14,6 @@ enhanced-determinism = [ "rapier2d/enhanced-determinism" ] [dependencies] rand = "0.8" Inflector = "0.11" -nalgebra = "0.27" [dependencies.rapier_testbed2d] path = "../build/rapier_testbed2d" diff --git a/benchmarks2d/all_benchmarks2.rs b/benchmarks2d/all_benchmarks2.rs index 72d67ed..ce6aaac 100644 --- a/benchmarks2d/all_benchmarks2.rs +++ b/benchmarks2d/all_benchmarks2.rs @@ -1,7 +1,5 @@ #![allow(dead_code)] -extern crate nalgebra as na; - #[cfg(target_arch = "wasm32")] use wasm_bindgen::prelude::*; diff --git a/benchmarks2d/heightfield2.rs b/benchmarks2d/heightfield2.rs index a07eb6e..3178e60 100644 --- a/benchmarks2d/heightfield2.rs +++ b/benchmarks2d/heightfield2.rs @@ -1,4 +1,4 @@ -use na::DVector; +use rapier2d::na::DVector; use rapier2d::prelude::*; use rapier_testbed2d::Testbed; diff --git a/benchmarks3d/Cargo.toml b/benchmarks3d/Cargo.toml index 8fca510..9b76df3 100644 --- a/benchmarks3d/Cargo.toml +++ b/benchmarks3d/Cargo.toml @@ -14,7 +14,6 @@ enhanced-determinism = [ "rapier3d/enhanced-determinism" ] [dependencies] rand = "0.8" Inflector = "0.11" -nalgebra = "0.27" [dependencies.rapier_testbed3d] path = "../build/rapier_testbed3d" diff --git a/benchmarks3d/all_benchmarks3.rs b/benchmarks3d/all_benchmarks3.rs index d62c72c..f61b80f 100644 --- a/benchmarks3d/all_benchmarks3.rs +++ b/benchmarks3d/all_benchmarks3.rs @@ -1,7 +1,5 @@ #![allow(dead_code)] -extern crate nalgebra as na; - #[cfg(target_arch = "wasm32")] use wasm_bindgen::prelude::*; diff --git a/benchmarks3d/heightfield3.rs b/benchmarks3d/heightfield3.rs index 3ddc0ec..32856fe 100644 --- a/benchmarks3d/heightfield3.rs +++ b/benchmarks3d/heightfield3.rs @@ -1,4 +1,4 @@ -use na::ComplexField; +use rapier3d::na::ComplexField; use rapier3d::prelude::*; use rapier_testbed3d::Testbed; diff --git a/benchmarks3d/trimesh3.rs b/benchmarks3d/trimesh3.rs index fe8f377..8621f19 100644 --- a/benchmarks3d/trimesh3.rs +++ b/benchmarks3d/trimesh3.rs @@ -1,4 +1,4 @@ -use na::ComplexField; +use rapier3d::na::ComplexField; use rapier3d::prelude::*; use rapier_testbed3d::Testbed; diff --git a/examples2d/Cargo.toml b/examples2d/Cargo.toml index f8a29bf..3c065fd 100644 --- a/examples2d/Cargo.toml +++ b/examples2d/Cargo.toml @@ -15,7 +15,6 @@ enhanced-determinism = [ "rapier2d/enhanced-determinism" ] [dependencies] rand = "0.8" Inflector = "0.11" -nalgebra = "0.27" lyon = "0.17" usvg = "0.14" diff --git a/examples2d/all_examples2.rs b/examples2d/all_examples2.rs index 1b45eac..0aedcc2 100644 --- a/examples2d/all_examples2.rs +++ b/examples2d/all_examples2.rs @@ -1,7 +1,5 @@ #![allow(dead_code)] -extern crate nalgebra as na; - #[cfg(target_arch = "wasm32")] use wasm_bindgen::prelude::*; diff --git a/examples2d/heightfield2.rs b/examples2d/heightfield2.rs index 6246c40..a965ad8 100644 --- a/examples2d/heightfield2.rs +++ b/examples2d/heightfield2.rs @@ -1,4 +1,4 @@ -use na::DVector; +use rapier2d::na::DVector; use rapier2d::prelude::*; use rapier_testbed2d::Testbed; diff --git a/examples2d/polyline2.rs b/examples2d/polyline2.rs index 7405e24..9f5241c 100644 --- a/examples2d/polyline2.rs +++ b/examples2d/polyline2.rs @@ -1,4 +1,4 @@ -use na::ComplexField; +use rapier2d::na::ComplexField; use rapier2d::prelude::*; use rapier_testbed2d::Testbed; diff --git a/examples3d/Cargo.toml b/examples3d/Cargo.toml index a80f3dc..897c92b 100644 --- a/examples3d/Cargo.toml +++ b/examples3d/Cargo.toml @@ -16,7 +16,6 @@ enhanced-determinism = [ "rapier3d/enhanced-determinism" ] rand = "0.8" getrandom = { version = "0.2", features = [ "js" ] } Inflector = "0.11" -nalgebra = "0.27" wasm-bindgen = "0.2" obj-rs = { version = "0.6", default-features = false } diff --git a/examples3d/all_examples3.rs b/examples3d/all_examples3.rs index f587da3..a9e1456 100644 --- a/examples3d/all_examples3.rs +++ b/examples3d/all_examples3.rs @@ -1,7 +1,5 @@ #![allow(dead_code)] -extern crate nalgebra as na; - #[cfg(target_arch = "wasm32")] use wasm_bindgen::prelude::*; diff --git a/examples3d/all_examples3_wasm.rs b/examples3d/all_examples3_wasm.rs index f587da3..a9e1456 100644 --- a/examples3d/all_examples3_wasm.rs +++ b/examples3d/all_examples3_wasm.rs @@ -1,7 +1,5 @@ #![allow(dead_code)] -extern crate nalgebra as na; - #[cfg(target_arch = "wasm32")] use wasm_bindgen::prelude::*; diff --git a/examples3d/convex_decomposition3.rs b/examples3d/convex_decomposition3.rs index 5676f6d..64c8802 100644 --- a/examples3d/convex_decomposition3.rs +++ b/examples3d/convex_decomposition3.rs @@ -40,7 +40,7 @@ pub fn init_world(testbed: &mut Testbed) { let shift = 5.0f32; for (igeom, obj_path) in geoms.into_iter().enumerate() { - let deltas = na::one(); + let deltas = Isometry::identity(); let mut shapes = Vec::new(); println!("Parsing and decomposing: {}", obj_path); diff --git a/examples3d/heightfield3.rs b/examples3d/heightfield3.rs index 7f5979a..bb93667 100644 --- a/examples3d/heightfield3.rs +++ b/examples3d/heightfield3.rs @@ -1,4 +1,4 @@ -use na::ComplexField; +use rapier3d::na::ComplexField; use rapier3d::prelude::*; use rapier_testbed3d::Testbed; diff --git a/examples3d/trimesh3.rs b/examples3d/trimesh3.rs index 23e4090..f5810aa 100644 --- a/examples3d/trimesh3.rs +++ b/examples3d/trimesh3.rs @@ -1,4 +1,4 @@ -use na::ComplexField; +use rapier3d::na::ComplexField; use rapier3d::prelude::*; use rapier_testbed3d::Testbed; diff --git a/src/lib.rs b/src/lib.rs index 1f32608..fd65766 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -157,4 +157,5 @@ pub mod prelude { pub use crate::math::*; pub use crate::pipeline::*; pub use na::{point, vector, DMatrix, DVector}; + pub extern crate nalgebra; } -- cgit