This commit is contained in:
1 parent
9f95ba3082
commit
fcd34f9079
12 files changed
+570
-1
No files matched your search
@@ -0,0 +1,131 @@
|
||||
//! Brush geometry validation helpers shared by editor tools and hydration.
|
||||
|
||||
use bevy::prelude::*;
|
||||
|
||||
const EPSILON: f32 = 0.0001;
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum BrushPolygonError {
|
||||
TooFewVertices,
|
||||
NonFiniteVertex,
|
||||
DuplicateVertex,
|
||||
ZeroArea,
|
||||
SelfIntersecting,
|
||||
NonConvex,
|
||||
}
|
||||
|
||||
pub fn signed_area_xz(vertices: &[Vec3]) -> f32 {
|
||||
if vertices.len() < 3 {
|
||||
return 0.0;
|
||||
}
|
||||
vertices
|
||||
.iter()
|
||||
.zip(vertices.iter().cycle().skip(1))
|
||||
.take(vertices.len())
|
||||
.map(|(a, b)| a.x * b.z - b.x * a.z)
|
||||
.sum::<f32>()
|
||||
* 0.5
|
||||
}
|
||||
|
||||
pub fn validate_floor_polygon(vertices: &[Vec3]) -> Result<(), BrushPolygonError> {
|
||||
if vertices.len() < 3 {
|
||||
return Err(BrushPolygonError::TooFewVertices);
|
||||
}
|
||||
if !vertices.iter().all(|vertex| vertex.is_finite()) {
|
||||
return Err(BrushPolygonError::NonFiniteVertex);
|
||||
}
|
||||
for i in 0..vertices.len() {
|
||||
for j in (i + 1)..vertices.len() {
|
||||
if vertices[i].xz().distance_squared(vertices[j].xz()) <= EPSILON * EPSILON {
|
||||
return Err(BrushPolygonError::DuplicateVertex);
|
||||
}
|
||||
}
|
||||
}
|
||||
let area = signed_area_xz(vertices);
|
||||
if self_intersects_xz(vertices) {
|
||||
return Err(BrushPolygonError::SelfIntersecting);
|
||||
}
|
||||
if area.abs() <= EPSILON {
|
||||
return Err(BrushPolygonError::ZeroArea);
|
||||
}
|
||||
if !is_convex_xz(vertices) {
|
||||
return Err(BrushPolygonError::NonConvex);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn self_intersects_xz(vertices: &[Vec3]) -> bool {
|
||||
for a in 0..vertices.len() {
|
||||
let b = (a + 1) % vertices.len();
|
||||
for c in (a + 1)..vertices.len() {
|
||||
let d = (c + 1) % vertices.len();
|
||||
if a == c || a == d || b == c || b == d {
|
||||
continue;
|
||||
}
|
||||
if segments_intersect_xz(vertices[a], vertices[b], vertices[c], vertices[d]) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
false
|
||||
}
|
||||
|
||||
fn segments_intersect_xz(a: Vec3, b: Vec3, c: Vec3, d: Vec3) -> bool {
|
||||
let ab_c = orient_xz(a, b, c);
|
||||
let ab_d = orient_xz(a, b, d);
|
||||
let cd_a = orient_xz(c, d, a);
|
||||
let cd_b = orient_xz(c, d, b);
|
||||
ab_c.signum() != ab_d.signum() && cd_a.signum() != cd_b.signum()
|
||||
}
|
||||
|
||||
fn is_convex_xz(vertices: &[Vec3]) -> bool {
|
||||
let winding = signed_area_xz(vertices).signum();
|
||||
vertices.iter().enumerate().all(|(index, current)| {
|
||||
let prev = vertices[(index + vertices.len() - 1) % vertices.len()];
|
||||
let next = vertices[(index + 1) % vertices.len()];
|
||||
let turn = orient_xz(prev, *current, next);
|
||||
turn.abs() <= EPSILON || turn.signum() == winding
|
||||
})
|
||||
}
|
||||
|
||||
fn orient_xz(a: Vec3, b: Vec3, c: Vec3) -> f32 {
|
||||
let ab = b.xz() - a.xz();
|
||||
let ac = c.xz() - a.xz();
|
||||
ab.x * ac.y - ab.y * ac.x
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn p(x: f32, z: f32) -> Vec3 {
|
||||
Vec3::new(x, 0.0, z)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn validates_convex_floor_polygon() {
|
||||
assert!(validate_floor_polygon(&[p(-1.0, -1.0), p(1.0, -1.0), p(1.0, 1.0)]).is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_self_intersecting_polygon() {
|
||||
assert_eq!(
|
||||
validate_floor_polygon(&[p(-1.0, -1.0), p(1.0, 1.0), p(1.0, -1.0), p(-1.0, 1.0),]),
|
||||
Err(BrushPolygonError::SelfIntersecting)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_non_convex_polygon() {
|
||||
assert_eq!(
|
||||
validate_floor_polygon(&[
|
||||
p(-1.0, -1.0),
|
||||
p(1.0, -1.0),
|
||||
p(0.0, 0.0),
|
||||
p(1.0, 1.0),
|
||||
p(-1.0, 1.0),
|
||||
]),
|
||||
Err(BrushPolygonError::NonConvex)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -426,6 +426,49 @@ impl BrushDesc {
|
||||
receive_shadows: true,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn extruded_prism(base_vertices: &[Vec3], height: f32) -> Option<Self> {
|
||||
if crate::brush_math::validate_floor_polygon(base_vertices).is_err() {
|
||||
return None;
|
||||
}
|
||||
let height = height.max(0.001);
|
||||
let mut base = base_vertices.to_vec();
|
||||
if crate::brush_math::signed_area_xz(&base) < 0.0 {
|
||||
base.reverse();
|
||||
}
|
||||
let top: Vec<Vec3> = base
|
||||
.iter()
|
||||
.map(|vertex| *vertex + Vec3::Y * height)
|
||||
.collect();
|
||||
let mut bottom = base.clone();
|
||||
bottom.reverse();
|
||||
|
||||
let mut faces = Vec::with_capacity(base.len() + 2);
|
||||
faces.push(brush_face("face:+y", Vec3::Y, top));
|
||||
faces.push(brush_face("face:-y", Vec3::NEG_Y, bottom));
|
||||
for index in 0..base.len() {
|
||||
let next = (index + 1) % base.len();
|
||||
let a = base[index];
|
||||
let b = base[next];
|
||||
let edge = b - a;
|
||||
let normal = Vec3::new(edge.z, 0.0, -edge.x).normalize_or_zero();
|
||||
if normal.length_squared() <= f32::EPSILON {
|
||||
return None;
|
||||
}
|
||||
faces.push(brush_face(
|
||||
&format!("face:side:{index}"),
|
||||
normal,
|
||||
vec![a, a + Vec3::Y * height, b + Vec3::Y * height, b],
|
||||
));
|
||||
}
|
||||
|
||||
Some(Self {
|
||||
kind: BrushKind::Additive,
|
||||
faces,
|
||||
cast_shadows: true,
|
||||
receive_shadows: true,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for BrushDesc {
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
//! from them by hydration systems in both the game and editor.
|
||||
|
||||
mod actor;
|
||||
pub mod brush_math;
|
||||
mod components;
|
||||
mod hydration;
|
||||
mod material_asset;
|
||||
|
||||
Reference in new issue
Block a user