From 154bc70037d42ef15d9a6c3288b8006027c2cb94 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Sat, 31 Oct 2020 14:42:14 +0100 Subject: Remove the Salva integration code from rapier + add a plugin system to the testbed. --- src_testbed/lib.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src_testbed/lib.rs') diff --git a/src_testbed/lib.rs b/src_testbed/lib.rs index e077bb1..4b0830f 100644 --- a/src_testbed/lib.rs +++ b/src_testbed/lib.rs @@ -13,6 +13,10 @@ extern crate nphysics3d as nphysics; extern crate rapier2d as rapier; #[cfg(feature = "dim3")] extern crate rapier3d as rapier; +#[cfg(all(feature = "dim2", feature = "fluids"))] +extern crate salva2d as salva; +#[cfg(all(feature = "dim3", feature = "fluids"))] +extern crate salva3d as salva; #[macro_use] extern crate bitflags; @@ -22,7 +26,8 @@ extern crate bitflags; extern crate log; pub use crate::engine::GraphicsManager; -pub use crate::testbed::Testbed; +pub use crate::plugin::TestbedPlugin; +pub use crate::testbed::{PhysicsState, Testbed}; #[cfg(all(feature = "dim2", feature = "other-backends"))] mod box2d_backend; @@ -32,6 +37,7 @@ mod nphysics_backend; pub mod objects; #[cfg(all(feature = "dim3", feature = "other-backends"))] mod physx_backend; +mod plugin; mod testbed; mod ui; -- cgit From 49dfe74a1bd21081fcdfc73489430f7515b09e93 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Thu, 19 Nov 2020 15:28:45 +0100 Subject: Remove traces of the `fluids` feature. --- src_testbed/lib.rs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src_testbed/lib.rs') diff --git a/src_testbed/lib.rs b/src_testbed/lib.rs index 4b0830f..21ac06a 100644 --- a/src_testbed/lib.rs +++ b/src_testbed/lib.rs @@ -13,10 +13,6 @@ extern crate nphysics3d as nphysics; extern crate rapier2d as rapier; #[cfg(feature = "dim3")] extern crate rapier3d as rapier; -#[cfg(all(feature = "dim2", feature = "fluids"))] -extern crate salva2d as salva; -#[cfg(all(feature = "dim3", feature = "fluids"))] -extern crate salva3d as salva; #[macro_use] extern crate bitflags; -- cgit