2026-05-07 00:08:17 +01:00
|
|
|
use bevy_math::Vec3;
|
|
|
|
|
|
|
|
|
|
use crate::{
|
2026-05-07 00:20:58 +01:00
|
|
|
Aabb, Brush, BrushId, BrushOp, ConvexSolid, MaterialId, Primitive, TriangleMesh,
|
|
|
|
|
append_cylinder_z, append_dome_cap_z, append_floret_arm,
|
2026-05-07 00:08:17 +01:00
|
|
|
primitives::{DomeCapZSpec, FloretArmSpec},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
|
|
|
pub enum BuildWarning {
|
|
|
|
|
SubtractIgnoredForNonBox { brush: String },
|
|
|
|
|
IntersectUnsupported { brush: String },
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Clone, Debug, Default)]
|
|
|
|
|
pub struct BuildReport {
|
|
|
|
|
pub input_brushes: usize,
|
2026-05-07 00:20:58 +01:00
|
|
|
pub emitted_convex_fragments: usize,
|
2026-05-07 00:08:17 +01:00
|
|
|
pub warnings: Vec<BuildWarning>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Clone, Debug)]
|
|
|
|
|
pub struct BuildOutput {
|
|
|
|
|
pub mesh: TriangleMesh,
|
|
|
|
|
pub report: BuildReport,
|
|
|
|
|
pub generation: u64,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Clone, Debug, Default)]
|
|
|
|
|
pub struct Assembler {
|
|
|
|
|
brushes: Vec<Brush>,
|
|
|
|
|
next_id: u32,
|
|
|
|
|
generation: u64,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Assembler {
|
|
|
|
|
pub fn new() -> Self {
|
|
|
|
|
Self::default()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn brushes(&self) -> &[Brush] {
|
|
|
|
|
&self.brushes
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn generation(&self) -> u64 {
|
|
|
|
|
self.generation
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn add_brush(
|
|
|
|
|
&mut self,
|
|
|
|
|
name: impl Into<String>,
|
|
|
|
|
op: BrushOp,
|
|
|
|
|
primitive: Primitive,
|
|
|
|
|
material: MaterialId,
|
|
|
|
|
) -> BrushId {
|
|
|
|
|
let id = BrushId(self.next_id);
|
|
|
|
|
self.next_id += 1;
|
|
|
|
|
self.brushes
|
|
|
|
|
.push(Brush::new(id, name, op, primitive, material));
|
|
|
|
|
self.generation = self.generation.wrapping_add(1);
|
|
|
|
|
id
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn solid_box(
|
|
|
|
|
&mut self,
|
|
|
|
|
name: impl Into<String>,
|
|
|
|
|
bounds: Aabb,
|
|
|
|
|
material: MaterialId,
|
|
|
|
|
) -> BrushId {
|
|
|
|
|
self.add_brush(name, BrushOp::Add, Primitive::Box { bounds }, material)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn cut_box(&mut self, name: impl Into<String>, bounds: Aabb) -> BrushId {
|
|
|
|
|
self.add_brush(
|
|
|
|
|
name,
|
|
|
|
|
BrushOp::Subtract,
|
|
|
|
|
Primitive::Box { bounds },
|
|
|
|
|
MaterialId::default(),
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
2026-05-07 00:20:58 +01:00
|
|
|
pub fn solid_oriented_box(
|
|
|
|
|
&mut self,
|
|
|
|
|
name: impl Into<String>,
|
|
|
|
|
center: Vec3,
|
|
|
|
|
size: Vec3,
|
|
|
|
|
rotation: bevy_math::Quat,
|
|
|
|
|
material: MaterialId,
|
|
|
|
|
) -> BrushId {
|
|
|
|
|
self.add_brush(
|
|
|
|
|
name,
|
|
|
|
|
BrushOp::Add,
|
|
|
|
|
Primitive::OrientedBox {
|
|
|
|
|
center,
|
|
|
|
|
size,
|
|
|
|
|
rotation,
|
|
|
|
|
},
|
|
|
|
|
material,
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn cut_oriented_box(
|
|
|
|
|
&mut self,
|
|
|
|
|
name: impl Into<String>,
|
|
|
|
|
center: Vec3,
|
|
|
|
|
size: Vec3,
|
|
|
|
|
rotation: bevy_math::Quat,
|
|
|
|
|
) -> BrushId {
|
|
|
|
|
self.add_brush(
|
|
|
|
|
name,
|
|
|
|
|
BrushOp::Subtract,
|
|
|
|
|
Primitive::OrientedBox {
|
|
|
|
|
center,
|
|
|
|
|
size,
|
|
|
|
|
rotation,
|
|
|
|
|
},
|
|
|
|
|
MaterialId::default(),
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
2026-05-07 00:08:17 +01:00
|
|
|
pub fn build(&self) -> BuildOutput {
|
|
|
|
|
let mut report = BuildReport {
|
|
|
|
|
input_brushes: self.brushes.len(),
|
|
|
|
|
..BuildReport::default()
|
|
|
|
|
};
|
|
|
|
|
let mut mesh = TriangleMesh::new();
|
2026-05-07 00:20:58 +01:00
|
|
|
let mut solids: Vec<ConvexSolid> = Vec::new();
|
2026-05-07 00:08:17 +01:00
|
|
|
|
|
|
|
|
for brush in &self.brushes {
|
|
|
|
|
match brush.op {
|
|
|
|
|
BrushOp::Add => match &brush.primitive {
|
2026-05-07 00:20:58 +01:00
|
|
|
Primitive::Box { bounds } => {
|
|
|
|
|
solids.push(ConvexSolid::from_aabb(*bounds, brush.material));
|
|
|
|
|
}
|
|
|
|
|
Primitive::OrientedBox {
|
|
|
|
|
center,
|
|
|
|
|
size,
|
|
|
|
|
rotation,
|
|
|
|
|
} => {
|
|
|
|
|
solids.push(ConvexSolid::box_from_center_size(
|
|
|
|
|
*center,
|
|
|
|
|
*size,
|
|
|
|
|
*rotation,
|
|
|
|
|
brush.material,
|
|
|
|
|
));
|
|
|
|
|
}
|
2026-05-07 00:08:17 +01:00
|
|
|
Primitive::CylinderZ {
|
|
|
|
|
center,
|
|
|
|
|
radius,
|
|
|
|
|
depth,
|
|
|
|
|
segments,
|
|
|
|
|
} => append_cylinder_z(
|
|
|
|
|
&mut mesh,
|
|
|
|
|
*center,
|
|
|
|
|
*radius,
|
|
|
|
|
*depth,
|
|
|
|
|
*segments,
|
|
|
|
|
brush.material,
|
|
|
|
|
),
|
|
|
|
|
Primitive::DomeCapZ {
|
|
|
|
|
center,
|
|
|
|
|
radius,
|
|
|
|
|
height,
|
|
|
|
|
rings,
|
|
|
|
|
segments,
|
|
|
|
|
} => append_dome_cap_z(
|
|
|
|
|
&mut mesh,
|
|
|
|
|
DomeCapZSpec {
|
|
|
|
|
center: *center,
|
|
|
|
|
radius: *radius,
|
|
|
|
|
height: *height,
|
|
|
|
|
rings: *rings,
|
|
|
|
|
segments: *segments,
|
|
|
|
|
material: brush.material,
|
|
|
|
|
},
|
|
|
|
|
),
|
|
|
|
|
Primitive::FloretArm {
|
|
|
|
|
anchor,
|
|
|
|
|
direction,
|
|
|
|
|
length,
|
|
|
|
|
root_width,
|
|
|
|
|
tip_width,
|
|
|
|
|
thickness,
|
|
|
|
|
tip_lift,
|
|
|
|
|
} => append_floret_arm(
|
|
|
|
|
&mut mesh,
|
|
|
|
|
FloretArmSpec {
|
|
|
|
|
anchor: *anchor,
|
|
|
|
|
direction: *direction,
|
|
|
|
|
length: *length,
|
|
|
|
|
root_width: *root_width,
|
|
|
|
|
tip_width: *tip_width,
|
|
|
|
|
thickness: *thickness,
|
|
|
|
|
tip_lift: *tip_lift,
|
|
|
|
|
material: brush.material,
|
|
|
|
|
},
|
|
|
|
|
),
|
|
|
|
|
},
|
|
|
|
|
BrushOp::Subtract => {
|
2026-05-07 00:20:58 +01:00
|
|
|
if let Some(cutter) = convex_cutter_for_brush(brush) {
|
|
|
|
|
solids = subtract_from_solids(&solids, &cutter);
|
2026-05-07 00:08:17 +01:00
|
|
|
} else {
|
|
|
|
|
report
|
|
|
|
|
.warnings
|
|
|
|
|
.push(BuildWarning::SubtractIgnoredForNonBox {
|
|
|
|
|
brush: brush.name.clone(),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
BrushOp::Intersect => {
|
|
|
|
|
report.warnings.push(BuildWarning::IntersectUnsupported {
|
|
|
|
|
brush: brush.name.clone(),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2026-05-07 00:20:58 +01:00
|
|
|
report.emitted_convex_fragments = solids.len();
|
|
|
|
|
for solid in solids {
|
|
|
|
|
solid.append_to_mesh(&mut mesh);
|
2026-05-07 00:08:17 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BuildOutput {
|
|
|
|
|
mesh,
|
|
|
|
|
report,
|
|
|
|
|
generation: self.generation,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn sample_room_with_door() -> Self {
|
|
|
|
|
let wall = MaterialId(1);
|
|
|
|
|
let floor = MaterialId(2);
|
|
|
|
|
let mut asm = Self::new();
|
|
|
|
|
asm.solid_box(
|
|
|
|
|
"floor",
|
|
|
|
|
Aabb::from_center_size(Vec3::new(0.0, 0.0, -0.1), Vec3::new(8.0, 8.0, 0.2)),
|
|
|
|
|
floor,
|
|
|
|
|
);
|
|
|
|
|
asm.solid_box(
|
|
|
|
|
"north wall",
|
|
|
|
|
Aabb::from_center_size(Vec3::new(0.0, 4.0, 1.5), Vec3::new(8.0, 0.25, 3.0)),
|
|
|
|
|
wall,
|
|
|
|
|
);
|
|
|
|
|
asm.cut_box(
|
|
|
|
|
"door void",
|
|
|
|
|
Aabb::from_center_size(Vec3::new(0.0, 4.0, 1.0), Vec3::new(1.2, 0.5, 2.0)),
|
|
|
|
|
);
|
|
|
|
|
asm
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2026-05-07 00:20:58 +01:00
|
|
|
fn convex_cutter_for_brush(brush: &Brush) -> Option<ConvexSolid> {
|
|
|
|
|
match &brush.primitive {
|
|
|
|
|
Primitive::Box { bounds } => Some(ConvexSolid::from_aabb(*bounds, brush.material)),
|
|
|
|
|
Primitive::OrientedBox {
|
|
|
|
|
center,
|
|
|
|
|
size,
|
|
|
|
|
rotation,
|
|
|
|
|
} => Some(ConvexSolid::box_from_center_size(
|
|
|
|
|
*center,
|
|
|
|
|
*size,
|
|
|
|
|
*rotation,
|
|
|
|
|
brush.material,
|
|
|
|
|
)),
|
|
|
|
|
_ => None,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn subtract_from_solids(solids: &[ConvexSolid], cutter: &ConvexSolid) -> Vec<ConvexSolid> {
|
|
|
|
|
let mut out = Vec::with_capacity(solids.len() + 4);
|
|
|
|
|
for solid in solids {
|
|
|
|
|
out.extend(solid.subtract_convex(cutter));
|
2026-05-07 00:08:17 +01:00
|
|
|
}
|
|
|
|
|
out
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
|
mod tests {
|
|
|
|
|
use bevy_math::Vec3;
|
|
|
|
|
|
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn centered_subtract_splits_box_into_six_fragments() {
|
|
|
|
|
let source = Aabb::from_center_size(Vec3::ZERO, Vec3::splat(4.0));
|
|
|
|
|
let cutter = Aabb::from_center_size(Vec3::ZERO, Vec3::splat(2.0));
|
|
|
|
|
let pieces = source.subtract_box(cutter);
|
|
|
|
|
|
|
|
|
|
assert_eq!(pieces.len(), 6);
|
|
|
|
|
assert!(pieces.iter().all(|piece| piece.is_valid()));
|
|
|
|
|
assert!(pieces.iter().all(|piece| !piece.intersects(cutter)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn door_cut_leaves_no_box_fragment_inside_void() {
|
|
|
|
|
let output = Assembler::sample_room_with_door().build();
|
|
|
|
|
let cutter = Aabb::from_center_size(Vec3::new(0.0, 4.0, 1.0), Vec3::new(1.2, 0.5, 2.0));
|
|
|
|
|
|
2026-05-07 00:20:58 +01:00
|
|
|
assert!(output.report.emitted_convex_fragments > 2);
|
2026-05-07 00:08:17 +01:00
|
|
|
for tri in output.mesh.indices.chunks_exact(3) {
|
|
|
|
|
let center = (output.mesh.positions[tri[0] as usize]
|
|
|
|
|
+ output.mesh.positions[tri[1] as usize]
|
|
|
|
|
+ output.mesh.positions[tri[2] as usize])
|
|
|
|
|
/ 3.0;
|
|
|
|
|
assert!(!cutter.contains_point_strict(center, 1.0e-4));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2026-05-07 00:20:58 +01:00
|
|
|
#[test]
|
|
|
|
|
fn rotated_door_cut_produces_diagonal_portal_faces() {
|
|
|
|
|
let mut asm = Assembler::new();
|
|
|
|
|
asm.solid_box(
|
|
|
|
|
"wall",
|
|
|
|
|
Aabb::from_center_size(Vec3::new(0.0, 0.0, 1.5), Vec3::new(5.0, 0.5, 3.0)),
|
|
|
|
|
MaterialId(1),
|
|
|
|
|
);
|
|
|
|
|
asm.cut_oriented_box(
|
|
|
|
|
"angled void",
|
|
|
|
|
Vec3::new(0.0, 0.0, 1.5),
|
|
|
|
|
Vec3::new(1.5, 2.0, 2.0),
|
|
|
|
|
bevy_math::Quat::from_rotation_z(std::f32::consts::FRAC_PI_4),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = asm.build();
|
|
|
|
|
assert!(output.report.emitted_convex_fragments > 2);
|
|
|
|
|
assert!(output.mesh.normals.iter().any(|normal| {
|
|
|
|
|
normal.x.abs() > 0.2 && normal.y.abs() > 0.2 && normal.z.abs() < 0.1
|
|
|
|
|
}));
|
|
|
|
|
}
|
|
|
|
|
|
2026-05-07 00:08:17 +01:00
|
|
|
#[test]
|
|
|
|
|
fn mesh_box_emits_twelve_triangles() {
|
|
|
|
|
let mut mesh = TriangleMesh::new();
|
|
|
|
|
mesh.append_box(Aabb::from_center_size(Vec3::ZERO, Vec3::ONE), MaterialId(7));
|
|
|
|
|
|
|
|
|
|
assert_eq!(mesh.triangle_count(), 12);
|
|
|
|
|
assert_eq!(mesh.triangle_materials.len(), 12);
|
|
|
|
|
assert_eq!(mesh.triangle_materials[0], MaterialId(7));
|
|
|
|
|
}
|
|
|
|
|
}
|