diff options
| -rw-r--r-- | examples3d/heightfield3.rs | 2 | ||||
| -rw-r--r-- | examples3d/primitives3.rs | 2 | ||||
| -rw-r--r-- | examples3d/trimesh3.rs | 2 | ||||
| -rw-r--r-- | src/geometry/collider.rs | 8 | ||||
| -rw-r--r-- | src/geometry/contact_generator/contact_dispatcher.rs | 4 | ||||
| -rw-r--r-- | src/geometry/rounded.rs | 2 | ||||
| -rw-r--r-- | src/geometry/shape.rs | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/examples3d/heightfield3.rs b/examples3d/heightfield3.rs index 8c3386a..1213020 100644 --- a/examples3d/heightfield3.rs +++ b/examples3d/heightfield3.rs @@ -59,7 +59,7 @@ pub fn init_world(testbed: &mut Testbed) { 1 => ColliderBuilder::ball(rad).build(), // Rounded cylinders are much more efficient that cylinder, even if the // rounding margin is small. - 2 => ColliderBuilder::rounded_cylinder(rad, rad, rad / 10.0).build(), + 2 => ColliderBuilder::round_cylinder(rad, rad, rad / 10.0).build(), _ => ColliderBuilder::cone(rad, rad).build(), }; diff --git a/examples3d/primitives3.rs b/examples3d/primitives3.rs index daabd23..96636a4 100644 --- a/examples3d/primitives3.rs +++ b/examples3d/primitives3.rs @@ -55,7 +55,7 @@ pub fn init_world(testbed: &mut Testbed) { 1 => ColliderBuilder::ball(rad).build(), // Rounded cylinders are much more efficient that cylinder, even if the // rounding margin is small. - 2 => ColliderBuilder::rounded_cylinder(rad, rad, rad / 10.0).build(), + 2 => ColliderBuilder::round_cylinder(rad, rad, rad / 10.0).build(), _ => ColliderBuilder::cone(rad, rad).build(), }; diff --git a/examples3d/trimesh3.rs b/examples3d/trimesh3.rs index 8fee784..5ada899 100644 --- a/examples3d/trimesh3.rs +++ b/examples3d/trimesh3.rs @@ -69,7 +69,7 @@ pub fn init_world(testbed: &mut Testbed) { 1 => ColliderBuilder::ball(rad).build(), // Rounded cylinders are much more efficient that cylinder, even if the // rounding margin is small. - 2 => ColliderBuilder::rounded_cylinder(rad, rad, rad / 10.0).build(), + 2 => ColliderBuilder::round_cylinder(rad, rad, rad / 10.0).build(), _ => ColliderBuilder::cone(rad, rad).build(), }; 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")] |