aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrozet Sébastien <developer@crozet.re>2021-01-23 13:34:03 +0100
committerCrozet Sébastien <developer@crozet.re>2021-01-23 13:34:03 +0100
commit90db26eb501b65cda362dcef34777106f533248b (patch)
tree38727a69353d1db8a491973a57c3b2a7e9eb3f74
parentded7bb746b661d19f1c986b1aa2e0b6d7b94e193 (diff)
downloadrapier-90db26eb501b65cda362dcef34777106f533248b.tar.gz
rapier-90db26eb501b65cda362dcef34777106f533248b.tar.bz2
rapier-90db26eb501b65cda362dcef34777106f533248b.zip
Fix warnings in tests and testbed.
-rw-r--r--examples2d/trimesh2.rs2
-rw-r--r--examples3d/convex_decomposition3.rs2
-rw-r--r--src/geometry/broad_phase_multi_sap.rs2
-rw-r--r--src/pipeline/physics_pipeline.rs2
-rw-r--r--src_testbed/testbed.rs3
-rw-r--r--src_testbed/ui.rs2
6 files changed, 6 insertions, 7 deletions
diff --git a/examples2d/trimesh2.rs b/examples2d/trimesh2.rs
index d77d841..baed184 100644
--- a/examples2d/trimesh2.rs
+++ b/examples2d/trimesh2.rs
@@ -1,4 +1,4 @@
-use na::{Point2, Point3};
+use na::Point2;
use rapier2d::dynamics::{JointSet, RigidBodyBuilder, RigidBodySet};
use rapier2d::geometry::{ColliderBuilder, ColliderSet};
use rapier_testbed2d::Testbed;
diff --git a/examples3d/convex_decomposition3.rs b/examples3d/convex_decomposition3.rs
index f3f0e24..20b78c7 100644
--- a/examples3d/convex_decomposition3.rs
+++ b/examples3d/convex_decomposition3.rs
@@ -1,7 +1,6 @@
use kiss3d::loader::obj;
use na::{Point3, Translation3};
use rapier3d::cdl::bounding_volume::{self, BoundingVolume};
-use rapier3d::cdl::transformation::vhacd::{VHACDParameters, VHACD};
use rapier3d::dynamics::{JointSet, RigidBodyBuilder, RigidBodySet};
use rapier3d::geometry::{ColliderBuilder, ColliderSet, SharedShape};
use rapier_testbed3d::Testbed;
@@ -73,7 +72,6 @@ pub fn init_world(testbed: &mut Testbed) {
trimesh.translate_by(&Translation3::from(-center));
trimesh.scale_by_scalar(6.0 / diag);
- let params = VHACDParameters::default();
let vertices = trimesh.coords;
let indices: Vec<_> = trimesh
.indices
diff --git a/src/geometry/broad_phase_multi_sap.rs b/src/geometry/broad_phase_multi_sap.rs
index 1ec4372..efbdd70 100644
--- a/src/geometry/broad_phase_multi_sap.rs
+++ b/src/geometry/broad_phase_multi_sap.rs
@@ -762,7 +762,7 @@ impl BroadPhase {
#[cfg(test)]
mod test {
use crate::dynamics::{JointSet, RigidBodyBuilder, RigidBodySet};
- use crate::geometry::{BroadPhase, ColliderBuilder, ColliderSet, NarrowPhase};
+ use crate::geometry::{BroadPhase, ColliderBuilder, ColliderSet};
#[test]
fn test_add_update_remove() {
diff --git a/src/pipeline/physics_pipeline.rs b/src/pipeline/physics_pipeline.rs
index d59a534..cba256c 100644
--- a/src/pipeline/physics_pipeline.rs
+++ b/src/pipeline/physics_pipeline.rs
@@ -250,7 +250,7 @@ impl PhysicsPipeline {
mod test {
use crate::dynamics::{IntegrationParameters, JointSet, RigidBodyBuilder, RigidBodySet};
use crate::geometry::{BroadPhase, ColliderBuilder, ColliderSet, NarrowPhase};
- use crate::math::{Real, Vector};
+ use crate::math::Vector;
use crate::pipeline::PhysicsPipeline;
#[test]
diff --git a/src_testbed/testbed.rs b/src_testbed/testbed.rs
index 6eb938a..506132c 100644
--- a/src_testbed/testbed.rs
+++ b/src_testbed/testbed.rs
@@ -35,8 +35,9 @@ use crate::nphysics_backend::NPhysicsWorld;
use crate::physx_backend::PhysxWorld;
const RAPIER_BACKEND: usize = 0;
+#[cfg(feature = "other-backends")]
const NPHYSICS_BACKEND: usize = 1;
-#[cfg(feature = "dim2")]
+#[cfg(all(feature = "dim2", feature = "other-backends"))]
const BOX2D_BACKEND: usize = 2;
pub(crate) const PHYSX_BACKEND_PATCH_FRICTION: usize = 2;
pub(crate) const PHYSX_BACKEND_TWO_FRICTION_DIR: usize = 3;
diff --git a/src_testbed/ui.rs b/src_testbed/ui.rs
index 6a323d8..43cdf17 100644
--- a/src_testbed/ui.rs
+++ b/src_testbed/ui.rs
@@ -137,7 +137,7 @@ impl TestbedUi {
.set(self.ids.backends_list, &mut ui)
{
if selected != state.selected_backend {
- #[cfg(feature = "dim3")]
+ #[cfg(all(feature = "dim3", feature = "other-backends"))]
fn is_physx(id: usize) -> bool {
id == crate::testbed::PHYSX_BACKEND_PATCH_FRICTION
|| id == crate::testbed::PHYSX_BACKEND_TWO_FRICTION_DIR