Fix some warnings.
This commit is contained in:
@@ -11,7 +11,6 @@ use crate::dynamics::{
|
|||||||
RigidBodyIds, RigidBodyMassProps, RigidBodyPosition, RigidBodyVelocity,
|
RigidBodyIds, RigidBodyMassProps, RigidBodyPosition, RigidBodyVelocity,
|
||||||
};
|
};
|
||||||
use crate::geometry::ColliderSet;
|
use crate::geometry::ColliderSet;
|
||||||
use parry::partitioning::IndexedData;
|
|
||||||
use std::ops::{Index, IndexMut};
|
use std::ops::{Index, IndexMut};
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
|
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ impl IntersectionEvent {
|
|||||||
|
|
||||||
pub(crate) use self::broad_phase_multi_sap::{BroadPhasePairEvent, ColliderPair, SAPProxyIndex};
|
pub(crate) use self::broad_phase_multi_sap::{BroadPhasePairEvent, ColliderPair, SAPProxyIndex};
|
||||||
pub(crate) use self::narrow_phase::ContactManifoldIndex;
|
pub(crate) use self::narrow_phase::ContactManifoldIndex;
|
||||||
pub(crate) use parry::partitioning::SimdQuadTree;
|
pub(crate) use parry::partitioning::QBVH;
|
||||||
pub use parry::shape::*;
|
pub use parry::shape::*;
|
||||||
|
|
||||||
#[cfg(feature = "serde-serialize")]
|
#[cfg(feature = "serde-serialize")]
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ use crate::dynamics::{
|
|||||||
};
|
};
|
||||||
use crate::geometry::{
|
use crate::geometry::{
|
||||||
ColliderGroups, ColliderHandle, ColliderParent, ColliderPosition, ColliderShape,
|
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 crate::math::{Isometry, Point, Real, Vector};
|
||||||
use parry::partitioning::SimdQuadtreeDataGenerator;
|
use parry::partitioning::QBVHDataGenerator;
|
||||||
use parry::query::details::{
|
use parry::query::details::{
|
||||||
IntersectionCompositeShapeShapeBestFirstVisitor,
|
IntersectionCompositeShapeShapeBestFirstVisitor,
|
||||||
NonlinearTOICompositeShapeShapeBestFirstVisitor, PointCompositeShapeProjBestFirstVisitor,
|
NonlinearTOICompositeShapeShapeBestFirstVisitor, PointCompositeShapeProjBestFirstVisitor,
|
||||||
@@ -32,7 +32,7 @@ pub struct QueryPipeline {
|
|||||||
serde(skip, default = "crate::geometry::default_query_dispatcher")
|
serde(skip, default = "crate::geometry::default_query_dispatcher")
|
||||||
)]
|
)]
|
||||||
query_dispatcher: Arc<dyn QueryDispatcher>,
|
query_dispatcher: Arc<dyn QueryDispatcher>,
|
||||||
quadtree: SimdQuadTree<ColliderHandle>,
|
quadtree: QBVH<ColliderHandle>,
|
||||||
tree_built: bool,
|
tree_built: bool,
|
||||||
dilation_factor: Real,
|
dilation_factor: Real,
|
||||||
}
|
}
|
||||||
@@ -95,7 +95,7 @@ where
|
|||||||
self.map_typed_part_at(shape_id, f);
|
self.map_typed_part_at(shape_id, f);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn typed_quadtree(&self) -> &SimdQuadTree<ColliderHandle> {
|
fn typed_quadtree(&self) -> &QBVH<ColliderHandle> {
|
||||||
&self.query_pipeline.quadtree
|
&self.query_pipeline.quadtree
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -136,7 +136,7 @@ impl QueryPipeline {
|
|||||||
{
|
{
|
||||||
Self {
|
Self {
|
||||||
query_dispatcher: Arc::new(d),
|
query_dispatcher: Arc::new(d),
|
||||||
quadtree: SimdQuadTree::new(),
|
quadtree: QBVH::new(),
|
||||||
tree_built: false,
|
tree_built: false,
|
||||||
dilation_factor: 0.01,
|
dilation_factor: 0.01,
|
||||||
}
|
}
|
||||||
@@ -194,7 +194,7 @@ impl QueryPipeline {
|
|||||||
mode: QueryPipelineMode,
|
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
|
where
|
||||||
Bs: ComponentSet<RigidBodyPosition>
|
Bs: ComponentSet<RigidBodyPosition>
|
||||||
+ ComponentSet<RigidBodyMassProps>
|
+ ComponentSet<RigidBodyMassProps>
|
||||||
|
|||||||
Reference in New Issue
Block a user