Reject invalid brush element edits
CI / Format, lint, test, build (push) Waiting to run

This commit is contained in:
Rbanh committed 2026-06-06 06:25:43 -04:00
1 parent 11b0df2b5f
commit d9e52d753b
2 files changed
+50 -17

No files matched your search

+49 -16
View File
@@ -2,7 +2,10 @@
use bevy::prelude::*;
use bevy_egui::{egui, EguiContexts};
use shared::{BrushDesc, BrushFaceDesc, BrushPlaneDesc, ComponentInstanceId};
use shared::{
brush_math::{validate_brush, BrushDiagnosticSeverity},
BrushDesc, BrushFaceDesc, BrushPlaneDesc, ComponentInstanceId,
};
use crate::camera::EditorCamera;
use crate::history::{push_command, EditorCommand};
@@ -297,23 +300,41 @@ fn brush_element_drag(
if buttons.just_released(MouseButton::Left) {
if let (Some(brush), Some(old)) = (drag.brush, drag.old.take()) {
if drag.changed {
if let Ok((brush_desc, _)) = brushes.get(brush) {
if let Ok((mut brush_desc, _)) = brushes.get_mut(brush) {
let new = brush_desc.clone();
commands.queue(move |world: &mut World| {
push_command(
world,
EditorCommand::SetBrush {
entity: brush,
old: Some(old),
new,
},
let validation = validate_brush(&new);
if validation.is_valid() {
commands.queue(move |world: &mut World| {
push_command(
world,
EditorCommand::SetBrush {
entity: brush,
old: Some(old),
new,
},
);
});
set_brush_edit_status(
&mut active_operator,
OperatorPhase::Committed,
"Committed brush element edit",
);
});
set_brush_edit_status(
&mut active_operator,
OperatorPhase::Committed,
"Committed brush element edit",
);
} else {
*brush_desc = old;
let message = validation
.diagnostics
.iter()
.find(|diagnostic| {
diagnostic.severity == BrushDiagnosticSeverity::Error
})
.map(|diagnostic| diagnostic.message.as_str())
.unwrap_or("Brush edit produced invalid geometry");
set_brush_edit_status(
&mut active_operator,
OperatorPhase::Blocked,
format!("Rejected brush edit: {message}"),
);
}
}
}
}
@@ -783,4 +804,16 @@ mod tests {
assert!(changed);
assert_eq!(before, after);
}
#[test]
fn collapsed_face_move_produces_invalid_brush() {
let mut brush = BrushDesc::default();
let face = brush.faces[0].id.clone();
assert!(move_selected_elements(
&mut brush,
&[BrushElementKey::Face { face }],
Vec3::new(-1.0, 0.0, 0.0),
));
assert!(!validate_brush(&brush).is_valid());
}
}