mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
4e3fb87526
- Rename Collider::get_radius to bounding_radius - Check origin difference in CapsulePrism with EPSILON * 10.0 instead of magic 0.00001 - Add comments for closest_points, hardnened expression against NaNs - Add comments to try_e2e_collision function, renamed to resolve_e2e_collision, make it return whether collision was triggered. - Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism with p0=p1=Vec2::zero())
219 lines
7.3 KiB
Rust
219 lines
7.3 KiB
Rust
/// Calculate the shortest distance between the surfaces of two shapes
|
|
use vek::*;
|
|
|
|
pub trait FindDist<T> {
|
|
/// Compute roughly whether the other shape is out of range
|
|
/// Meant to be a cheap method for initial filtering
|
|
/// Must return true if the shape could be within the supplied distance but
|
|
/// is allowed to return true if the shape is actually just out of
|
|
/// range
|
|
fn approx_in_range(self, other: T, range: f32) -> bool;
|
|
/// Find the smallest distance between the two shapes
|
|
fn min_distance(self, other: T) -> f32;
|
|
}
|
|
|
|
/// A z-axis aligned cylinder
|
|
#[derive(Clone, Copy, Debug)]
|
|
pub struct Cylinder {
|
|
/// Center of the cylinder
|
|
pub center: Vec3<f32>,
|
|
/// Radius of the cylinder
|
|
pub radius: f32,
|
|
/// Height of the cylinder
|
|
pub height: f32,
|
|
}
|
|
|
|
impl Cylinder {
|
|
fn aabb(&self) -> Aabb<f32> {
|
|
Aabb {
|
|
min: self.center - Vec3::new(self.radius, self.radius, self.height / 2.0),
|
|
max: self.center + Vec3::new(self.radius, self.radius, self.height / 2.0),
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn from_components(
|
|
pos: Vec3<f32>,
|
|
scale: Option<crate::comp::Scale>,
|
|
collider: Option<&crate::comp::Collider>,
|
|
char_state: Option<&crate::comp::CharacterState>,
|
|
) -> Self {
|
|
let scale = scale.map_or(1.0, |s| s.0);
|
|
let radius = collider.as_ref().map_or(0.5, |c| c.bounding_radius()) * scale;
|
|
let z_limit_modifier = char_state
|
|
.filter(|char_state| char_state.is_dodge())
|
|
.map_or(1.0, |_| 0.5)
|
|
* scale;
|
|
let (z_bottom, z_top) = collider
|
|
.map(|c| c.get_z_limits(z_limit_modifier))
|
|
.unwrap_or((-0.5 * z_limit_modifier, 0.5 * z_limit_modifier));
|
|
|
|
Self {
|
|
center: pos + Vec3::unit_z() * (z_top + z_bottom) / 2.0,
|
|
radius,
|
|
height: z_top - z_bottom,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// An axis aligned cube
|
|
#[derive(Clone, Copy, Debug)]
|
|
pub struct Cube {
|
|
/// The position of min corner of the cube
|
|
pub min: Vec3<f32>,
|
|
/// The side length of the cube
|
|
pub side_length: f32,
|
|
}
|
|
|
|
impl FindDist<Cylinder> for Cube {
|
|
#[inline]
|
|
fn approx_in_range(self, other: Cylinder, range: f32) -> bool {
|
|
let cube_plus_range_aabb = Aabb {
|
|
min: self.min - range,
|
|
max: self.min + self.side_length + range,
|
|
};
|
|
let cylinder_aabb = other.aabb();
|
|
|
|
cube_plus_range_aabb.collides_with_aabb(cylinder_aabb)
|
|
}
|
|
|
|
#[inline]
|
|
fn min_distance(self, other: Cylinder) -> f32 {
|
|
// Distance between centers along the z-axis
|
|
let z_center_dist = (self.min.z + self.side_length / 2.0 - other.center.z).abs();
|
|
// Distance between surfaces projected onto the z-axis
|
|
let z_dist = (z_center_dist - (self.side_length + other.height) / 2.0).max(0.0);
|
|
// Distance between shapes projected onto the xy plane as a square/circle
|
|
let square_aabr = Aabr {
|
|
min: self.min.xy(),
|
|
max: self.min.xy() + self.side_length,
|
|
};
|
|
let xy_dist = (square_aabr.distance_to_point(other.center.xy()) - other.radius).max(0.0);
|
|
// Overall distance by pythagoras
|
|
(z_dist.powi(2) + xy_dist.powi(2)).sqrt()
|
|
}
|
|
}
|
|
|
|
impl FindDist<Cube> for Cylinder {
|
|
#[inline]
|
|
fn approx_in_range(self, other: Cube, range: f32) -> bool { other.approx_in_range(self, range) }
|
|
|
|
#[inline]
|
|
fn min_distance(self, other: Cube) -> f32 { other.min_distance(self) }
|
|
}
|
|
|
|
impl FindDist<Cylinder> for Cylinder {
|
|
#[inline]
|
|
fn approx_in_range(self, other: Cylinder, range: f32) -> bool {
|
|
let mut aabb = self.aabb();
|
|
aabb.min -= range;
|
|
aabb.max += range;
|
|
|
|
aabb.collides_with_aabb(other.aabb())
|
|
}
|
|
|
|
#[inline]
|
|
fn min_distance(self, other: Cylinder) -> f32 {
|
|
// Distance between centers along the z-axis
|
|
let z_center_dist = (self.center.z - other.center.z).abs();
|
|
// Distance between surfaces projected onto the z-axis
|
|
let z_dist = (z_center_dist - (self.height + other.height) / 2.0).max(0.0);
|
|
// Distance between shapes projected onto the xy plane as a circles
|
|
let xy_dist =
|
|
(self.center.xy().distance(other.center.xy()) - self.radius - other.radius).max(0.0);
|
|
// Overall distance by pythagoras
|
|
(z_dist.powi(2) + xy_dist.powi(2)).sqrt()
|
|
}
|
|
}
|
|
|
|
impl FindDist<Vec3<f32>> for Cylinder {
|
|
#[inline]
|
|
fn approx_in_range(self, other: Vec3<f32>, range: f32) -> bool {
|
|
let mut aabb = self.aabb();
|
|
aabb.min -= range;
|
|
aabb.max += range;
|
|
|
|
aabb.contains_point(other)
|
|
}
|
|
|
|
#[inline]
|
|
fn min_distance(self, other: Vec3<f32>) -> f32 {
|
|
// Distance between center and point along the z-axis
|
|
let z_center_dist = (self.center.z - other.z).abs();
|
|
// Distance between surface and point projected onto the z-axis
|
|
let z_dist = (z_center_dist - self.height / 2.0).max(0.0);
|
|
// Distance between shapes projected onto the xy plane
|
|
let xy_dist = (self.center.xy().distance(other.xy()) - self.radius).max(0.0);
|
|
// Overall distance by pythagoras
|
|
(z_dist.powi(2) + xy_dist.powi(2)).sqrt()
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn cylinder_vs_cube() {
|
|
//let offset = Vec3::new(1213.323, 5424.0, -231.0);
|
|
let offset = Vec3::zero();
|
|
let cylinder = Cylinder {
|
|
center: Vec3::new(0.0, 0.0, 0.0) + offset,
|
|
radius: 2.0,
|
|
height: 4.0,
|
|
};
|
|
|
|
let cube = Cube {
|
|
min: Vec3::new(-0.5, -0.5, -0.5) + offset,
|
|
side_length: 1.0,
|
|
};
|
|
|
|
assert!(cube.approx_in_range(cylinder, 0.0));
|
|
assert!(cube.min_distance(cylinder).abs() < f32::EPSILON);
|
|
assert!((cube.min_distance(cylinder) - cylinder.min_distance(cube)).abs() < 0.001);
|
|
|
|
let cube = Cube {
|
|
min: cube.min + Vec3::unit_x() * 50.0,
|
|
side_length: 1.0,
|
|
};
|
|
|
|
assert!(!cube.approx_in_range(cylinder, 5.0)); // Note: technically it is not breaking any promises if this returns true but this will be useful as a warning if the filtering is not tight as we were expecting
|
|
assert!(cube.approx_in_range(cylinder, 47.51));
|
|
assert!((cube.min_distance(cylinder) - 47.5).abs() < 0.001);
|
|
assert!((cube.min_distance(cylinder) - cylinder.min_distance(cube)).abs() < 0.001);
|
|
}
|
|
|
|
#[test]
|
|
fn zero_size_cylinder() {
|
|
let cylinder = Cylinder {
|
|
center: Vec3::new(1.0, 2.0, 3.0),
|
|
radius: 0.0,
|
|
height: 0.0,
|
|
};
|
|
|
|
let point = Vec3::new(1.0, 2.5, 3.5);
|
|
|
|
assert!(cylinder.approx_in_range(point, 0.71));
|
|
assert!(cylinder.min_distance(point) < 0.71);
|
|
assert!(cylinder.min_distance(point) > 0.70);
|
|
|
|
let cube = Cube {
|
|
min: Vec3::new(0.5, 1.9, 2.1),
|
|
side_length: 1.0,
|
|
};
|
|
|
|
assert!(cylinder.approx_in_range(cube, 0.0));
|
|
assert!(cylinder.min_distance(cube) < f32::EPSILON);
|
|
|
|
let cube = Cube {
|
|
min: Vec3::new(1.0, 2.0, 4.5),
|
|
side_length: 1.0,
|
|
};
|
|
|
|
assert!(cylinder.approx_in_range(cube, 1.51));
|
|
assert!(cylinder.approx_in_range(cube, 100.51));
|
|
assert!(cylinder.min_distance(cube) < 1.501);
|
|
assert!(cylinder.min_distance(cube) > 1.499);
|
|
}
|
|
}
|