aboutsummaryrefslogtreecommitdiff
path: root/src/geometry
diff options
context:
space:
mode:
authorCrozet Sébastien <developer@crozet.re>2020-10-20 18:14:20 +0200
committerCrozet Sébastien <developer@crozet.re>2020-10-20 18:14:20 +0200
commitf7a6f433d62ea427f6e2233365a6f534ca7e1c63 (patch)
treea54b68e92bfdc2154cdd94d1404e4bceee4f8a55 /src/geometry
parent949e3f5384a366c3bff5415c5db4635e811a580e (diff)
downloadrapier-f7a6f433d62ea427f6e2233365a6f534ca7e1c63.tar.gz
rapier-f7a6f433d62ea427f6e2233365a6f534ca7e1c63.tar.bz2
rapier-f7a6f433d62ea427f6e2233365a6f534ca7e1c63.zip
Rename rounded -> round.
Diffstat (limited to 'src/geometry')
-rw-r--r--src/geometry/collider.rs8
-rw-r--r--src/geometry/contact_generator/contact_dispatcher.rs4
-rw-r--r--src/geometry/rounded.rs2
-rw-r--r--src/geometry/shape.rs4
4 files changed, 9 insertions, 9 deletions
diff --git a/src/geometry/collider.rs b/src/geometry/collider.rs
index 4785d62..755ae5a 100644
--- a/src/geometry/collider.rs
+++ b/src/geometry/collider.rs
@@ -39,7 +39,7 @@ impl ColliderShape {
/// (along along the y axis), its radius, and its roundedness (the
/// radius of the sphere used for dilating the cylinder).
#[cfg(feature = "dim3")]
- pub fn rounded_cylinder(half_height: f32, radius: f32, rounding_radius: f32) -> Self {
+ pub fn round_cylinder(half_height: f32, radius: f32, rounding_radius: f32) -> Self {
ColliderShape(Arc::new(Rounded::new(
Cylinder::new(half_height, radius),
rounding_radius,
@@ -164,7 +164,7 @@ impl<'de> serde::Deserialize<'de> for ColliderShape {
#[cfg(feature = "dim3")]
Some(ShapeType::Cone) => deser::<A, Cone>(&mut seq)?,
#[cfg(feature = "dim3")]
- Some(ShapeType::RoundedCylinder) => deser::<A, Rounded<Cylinder>>(&mut seq)?,
+ Some(ShapeType::RoundCylinder) => deser::<A, Rounded<Cylinder>>(&mut seq)?,
None => {
return Err(serde::de::Error::custom(
"found invalid shape type to deserialize",
@@ -326,8 +326,8 @@ impl ColliderBuilder {
/// (along along the y axis), its radius, and its roundedness (the
/// radius of the sphere used for dilating the cylinder).
#[cfg(feature = "dim3")]
- pub fn rounded_cylinder(half_height: f32, radius: f32, rounding_radius: f32) -> Self {
- Self::new(ColliderShape::rounded_cylinder(
+ pub fn round_cylinder(half_height: f32, radius: f32, rounding_radius: f32) -> Self {
+ Self::new(ColliderShape::round_cylinder(
half_height,
radius,
rounding_radius,
diff --git a/src/geometry/contact_generator/contact_dispatcher.rs b/src/geometry/contact_generator/contact_dispatcher.rs
index 53165ee..62a1f71 100644
--- a/src/geometry/contact_generator/contact_dispatcher.rs
+++ b/src/geometry/contact_generator/contact_dispatcher.rs
@@ -98,8 +98,8 @@ impl ContactDispatcher for DefaultContactDispatcher {
| (_, ShapeType::Cylinder)
| (ShapeType::Cone, _)
| (_, ShapeType::Cone)
- | (ShapeType::RoundedCylinder, _)
- | (_, ShapeType::RoundedCylinder) => (
+ | (ShapeType::RoundCylinder, _)
+ | (_, ShapeType::RoundCylinder) => (
PrimitiveContactGenerator {
generate_contacts: super::generate_contacts_pfm_pfm,
..PrimitiveContactGenerator::default()
diff --git a/src/geometry/rounded.rs b/src/geometry/rounded.rs
index ce3fc96..bfbab3b 100644
--- a/src/geometry/rounded.rs
+++ b/src/geometry/rounded.rs
@@ -17,7 +17,7 @@ pub trait Roundable {
#[cfg(feature = "dim3")]
impl Roundable for Cylinder {
fn rounded_shape_type() -> ShapeType {
- ShapeType::RoundedCylinder
+ ShapeType::RoundCylinder
}
}
diff --git a/src/geometry/shape.rs b/src/geometry/shape.rs
index b6350e9..80c9b51 100644
--- a/src/geometry/shape.rs
+++ b/src/geometry/shape.rs
@@ -48,7 +48,7 @@ pub enum ShapeType {
// RoundedHeightField,
/// A cylinder with rounded corners.
#[cfg(feature = "dim3")]
- RoundedCylinder,
+ RoundCylinder,
// /// A cone with rounded corners.
// RoundedCone,
}
@@ -345,7 +345,7 @@ impl Shape for Rounded<Cylinder> {
}
fn shape_type(&self) -> ShapeType {
- ShapeType::RoundedCylinder
+ ShapeType::RoundCylinder
}
#[cfg(feature = "dim3")]