From 3cab54b880fbe762cd0909c51b8b8e18c45c4745 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Tue, 27 Apr 2021 14:37:39 +0200
Subject: Fix some warnings.

---
 src/dynamics/rigid_body_set.rs |  1 -
 src/geometry/mod.rs            |  2 +-
 src/pipeline/query_pipeline.rs | 12 ++++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/dynamics/rigid_body_set.rs b/src/dynamics/rigid_body_set.rs
index 10e7bf8..7b4a31f 100644
--- a/src/dynamics/rigid_body_set.rs
+++ b/src/dynamics/rigid_body_set.rs
@@ -11,7 +11,6 @@ use crate::dynamics::{
     RigidBodyIds, RigidBodyMassProps, RigidBodyPosition, RigidBodyVelocity,
 };
 use crate::geometry::ColliderSet;
-use parry::partitioning::IndexedData;
 use std::ops::{Index, IndexMut};
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
diff --git a/src/geometry/mod.rs b/src/geometry/mod.rs
index 9835bee..a4b17f3 100644
--- a/src/geometry/mod.rs
+++ b/src/geometry/mod.rs
@@ -90,7 +90,7 @@ impl IntersectionEvent {
 
 pub(crate) use self::broad_phase_multi_sap::{BroadPhasePairEvent, ColliderPair, SAPProxyIndex};
 pub(crate) use self::narrow_phase::ContactManifoldIndex;
-pub(crate) use parry::partitioning::SimdQuadTree;
+pub(crate) use parry::partitioning::QBVH;
 pub use parry::shape::*;
 
 #[cfg(feature = "serde-serialize")]
diff --git a/src/pipeline/query_pipeline.rs b/src/pipeline/query_pipeline.rs
index 3139a88..592b4a6 100644
--- a/src/pipeline/query_pipeline.rs
+++ b/src/pipeline/query_pipeline.rs
@@ -5,10 +5,10 @@ use crate::dynamics::{
 };
 use crate::geometry::{
     ColliderGroups, ColliderHandle, ColliderParent, ColliderPosition, ColliderShape,
-    InteractionGroups, PointProjection, Ray, RayIntersection, SimdQuadTree, AABB,
+    InteractionGroups, PointProjection, Ray, RayIntersection, AABB, QBVH,
 };
 use crate::math::{Isometry, Point, Real, Vector};
-use parry::partitioning::SimdQuadtreeDataGenerator;
+use parry::partitioning::QBVHDataGenerator;
 use parry::query::details::{
     IntersectionCompositeShapeShapeBestFirstVisitor,
     NonlinearTOICompositeShapeShapeBestFirstVisitor, PointCompositeShapeProjBestFirstVisitor,
@@ -32,7 +32,7 @@ pub struct QueryPipeline {
         serde(skip, default = "crate::geometry::default_query_dispatcher")
     )]
     query_dispatcher: Arc<dyn QueryDispatcher>,
-    quadtree: SimdQuadTree<ColliderHandle>,
+    quadtree: QBVH<ColliderHandle>,
     tree_built: bool,
     dilation_factor: Real,
 }
@@ -95,7 +95,7 @@ where
         self.map_typed_part_at(shape_id, f);
     }
 
-    fn typed_quadtree(&self) -> &SimdQuadTree<ColliderHandle> {
+    fn typed_quadtree(&self) -> &QBVH<ColliderHandle> {
         &self.query_pipeline.quadtree
     }
 }
@@ -136,7 +136,7 @@ impl QueryPipeline {
     {
         Self {
             query_dispatcher: Arc::new(d),
-            quadtree: SimdQuadTree::new(),
+            quadtree: QBVH::new(),
             tree_built: false,
             dilation_factor: 0.01,
         }
@@ -194,7 +194,7 @@ impl QueryPipeline {
             mode: QueryPipelineMode,
         }
 
-        impl<'a, Bs, Cs> SimdQuadtreeDataGenerator<ColliderHandle> for DataGenerator<'a, Bs, Cs>
+        impl<'a, Bs, Cs> QBVHDataGenerator<ColliderHandle> for DataGenerator<'a, Bs, Cs>
         where
             Bs: ComponentSet<RigidBodyPosition>
                 + ComponentSet<RigidBodyMassProps>
-- 
cgit