aboutsummaryrefslogtreecommitdiff
path: root/src/pipeline
diff options
context:
space:
mode:
authorCrozet Sébastien <developer@crozet.re>2021-01-24 11:13:44 +0100
committerCrozet Sébastien <developer@crozet.re>2021-01-24 11:13:44 +0100
commit8f7220f03d3c23574b9ece09d81d32e862f1b5c6 (patch)
tree643baa2128965fbbaab3f13c67644eba90b8135c /src/pipeline
parent90db26eb501b65cda362dcef34777106f533248b (diff)
downloadrapier-8f7220f03d3c23574b9ece09d81d32e862f1b5c6.tar.gz
rapier-8f7220f03d3c23574b9ece09d81d32e862f1b5c6.tar.bz2
rapier-8f7220f03d3c23574b9ece09d81d32e862f1b5c6.zip
Rename cdl to parry.
Diffstat (limited to 'src/pipeline')
-rw-r--r--src/pipeline/collision_pipeline.rs6
-rw-r--r--src/pipeline/physics_pipeline.rs4
-rw-r--r--src/pipeline/query_pipeline.rs10
3 files changed, 10 insertions, 10 deletions
diff --git a/src/pipeline/collision_pipeline.rs b/src/pipeline/collision_pipeline.rs
index 8855af0..866c3a5 100644
--- a/src/pipeline/collision_pipeline.rs
+++ b/src/pipeline/collision_pipeline.rs
@@ -2,8 +2,8 @@
use crate::dynamics::{JointSet, RigidBodySet};
use crate::geometry::{
- BroadPhase, BroadPhasePairEvent, ColliderPair, ColliderSet, ContactPairFilter, NarrowPhase,
- ProximityPairFilter,
+ BroadPhase, BroadPhasePairEvent, ColliderPair, ColliderSet, ContactPairFilter,
+ IntersectionPairFilter, NarrowPhase,
};
use crate::math::Real;
use crate::pipeline::EventHandler;
@@ -45,7 +45,7 @@ impl CollisionPipeline {
bodies: &mut RigidBodySet,
colliders: &mut ColliderSet,
contact_pair_filter: Option<&dyn ContactPairFilter>,
- proximity_pair_filter: Option<&dyn ProximityPairFilter>,
+ proximity_pair_filter: Option<&dyn IntersectionPairFilter>,
events: &dyn EventHandler,
) {
bodies.maintain(colliders);
diff --git a/src/pipeline/physics_pipeline.rs b/src/pipeline/physics_pipeline.rs
index cba256c..b5f123d 100644
--- a/src/pipeline/physics_pipeline.rs
+++ b/src/pipeline/physics_pipeline.rs
@@ -8,7 +8,7 @@ use crate::dynamics::{IntegrationParameters, JointSet, RigidBodySet};
use crate::dynamics::{JointGraphEdge, ParallelIslandSolver as IslandSolver};
use crate::geometry::{
BroadPhase, BroadPhasePairEvent, ColliderPair, ColliderSet, ContactManifoldIndex,
- ContactPairFilter, NarrowPhase, ProximityPairFilter,
+ ContactPairFilter, IntersectionPairFilter, NarrowPhase,
};
use crate::math::{Real, Vector};
use crate::pipeline::EventHandler;
@@ -70,7 +70,7 @@ impl PhysicsPipeline {
colliders: &mut ColliderSet,
joints: &mut JointSet,
contact_pair_filter: Option<&dyn ContactPairFilter>,
- proximity_pair_filter: Option<&dyn ProximityPairFilter>,
+ proximity_pair_filter: Option<&dyn IntersectionPairFilter>,
events: &dyn EventHandler,
) {
self.counters.step_started();
diff --git a/src/pipeline/query_pipeline.rs b/src/pipeline/query_pipeline.rs
index 5e0b2ea..145dd87 100644
--- a/src/pipeline/query_pipeline.rs
+++ b/src/pipeline/query_pipeline.rs
@@ -1,22 +1,22 @@
-use crate::cdl::motion::RigidMotion;
use crate::dynamics::RigidBodySet;
use crate::geometry::{
Collider, ColliderHandle, ColliderSet, InteractionGroups, PointProjection, Ray,
RayIntersection, SimdQuadTree,
};
use crate::math::{Isometry, Point, Real, Vector};
-use cdl::query::details::{
+use crate::parry::motion::RigidMotion;
+use parry::query::details::{
IntersectionCompositeShapeShapeBestFirstVisitor,
NonlinearTOICompositeShapeShapeBestFirstVisitor, PointCompositeShapeProjBestFirstVisitor,
PointCompositeShapeProjWithFeatureBestFirstVisitor,
RayCompositeShapeToiAndNormalBestFirstVisitor, RayCompositeShapeToiBestFirstVisitor,
TOICompositeShapeShapeBestFirstVisitor,
};
-use cdl::query::visitors::{
+use parry::query::visitors::{
BoundingVolumeIntersectionsVisitor, PointIntersectionsVisitor, RayIntersectionsVisitor,
};
-use cdl::query::{DefaultQueryDispatcher, QueryDispatcher, TOI};
-use cdl::shape::{FeatureId, Shape, TypedSimdCompositeShape};
+use parry::query::{DefaultQueryDispatcher, QueryDispatcher, TOI};
+use parry::shape::{FeatureId, Shape, TypedSimdCompositeShape};
use std::sync::Arc;
/// A pipeline for performing queries on all the colliders of a scene.