This commit is contained in:
1 parent
9f95ba3082
commit
fcd34f9079
12 files changed
+570
-1
No files matched your search
@@ -12,6 +12,7 @@ use crate::ui::helpers::{
|
||||
use crate::ui::selection_ops::{focus_editor_camera_on_selection, reset_selected_transforms};
|
||||
use crate::ui::theme::{apply_editor_theme, PANEL_BG, TEXT, TEXT_DIM};
|
||||
use crate::ui::UiState;
|
||||
use crate::viewport::brush_tool::start_draw_brush_tool;
|
||||
|
||||
/// Named editor command invokable from the palette and BRP.
|
||||
pub trait EditorCommand: Send + Sync {
|
||||
@@ -180,6 +181,7 @@ fn register_builtin_commands(mut registry: ResMut<EditorCommandRegistry>) {
|
||||
registry.register(Box::new(CreatePostProcessVolumeCommand));
|
||||
registry.register(Box::new(FocusActiveVolumesCommand));
|
||||
registry.register(Box::new(SelectVolumesAtCameraCommand));
|
||||
registry.register(Box::new(DrawBrushCommand));
|
||||
}
|
||||
|
||||
fn run_palette_commands(world: &mut World) {
|
||||
@@ -331,6 +333,27 @@ impl EditorCommand for ResetSelectionTransformCommand {
|
||||
}
|
||||
}
|
||||
|
||||
struct DrawBrushCommand;
|
||||
|
||||
impl EditorCommand for DrawBrushCommand {
|
||||
fn name(&self) -> &str {
|
||||
"brush.draw"
|
||||
}
|
||||
|
||||
fn label(&self) -> &str {
|
||||
"Draw Brush"
|
||||
}
|
||||
|
||||
fn disabled_reason(&self, world: &World) -> Option<String> {
|
||||
(*world.resource::<State<EditorMode>>().get() != EditorMode::Editing)
|
||||
.then(|| "Enter Edit mode before drawing brushes".to_string())
|
||||
}
|
||||
|
||||
fn execute(&self, world: &mut World) {
|
||||
start_draw_brush_tool(world);
|
||||
}
|
||||
}
|
||||
|
||||
struct CreatePostProcessVolumeCommand;
|
||||
|
||||
impl EditorCommand for CreatePostProcessVolumeCommand {
|
||||
|
||||
@@ -29,6 +29,7 @@ pub use scene::scene_io;
|
||||
pub use scene::scene_schema;
|
||||
pub use scene::scene_view;
|
||||
pub use viewport::actor_icons;
|
||||
pub use viewport::brush_tool;
|
||||
pub use viewport::camera;
|
||||
pub use viewport::gizmos;
|
||||
pub use viewport::render_view;
|
||||
@@ -47,6 +48,7 @@ use transform_gizmo_bevy::prelude::TransformGizmoPlugin;
|
||||
|
||||
use actor_icons::ActorIconsPlugin;
|
||||
use asset_db::AssetDbPlugin;
|
||||
use brush_tool::BrushToolPlugin;
|
||||
use camera::EditorCameraPlugin;
|
||||
use extensibility::ExtensibilityPlugin;
|
||||
use gizmos::EditorGizmoPlugin;
|
||||
@@ -89,6 +91,7 @@ impl PluginGroup for EditorPluginGroup {
|
||||
.add(SceneViewPlugin)
|
||||
.add(PlaySessionPlugin)
|
||||
.add(ViewportPlugin)
|
||||
.add(BrushToolPlugin)
|
||||
.add(EditorCameraPlugin)
|
||||
.add(ActorIconsPlugin)
|
||||
.add(EditorSelectionPlugin)
|
||||
|
||||
@@ -8,6 +8,7 @@ use crate::history::spawn_with_history;
|
||||
use crate::scene_io::{SceneIo, SceneIoRequest};
|
||||
use crate::state::{EditorMode, PlayPaused, PlayPossession};
|
||||
use crate::ui::UiState;
|
||||
use crate::viewport::brush_tool::start_draw_brush_tool;
|
||||
use crate::viewport::{editor_spawn_ground_position, snap_translation, ViewportSettings};
|
||||
use shared::PrimitiveShape;
|
||||
|
||||
@@ -87,6 +88,9 @@ fn left_toolbar(world: &mut World, ui: &mut egui::Ui) {
|
||||
let pos = camera_ground_spawn(world);
|
||||
spawn_with_history(world, light_snapshot("Point Light", pos));
|
||||
}
|
||||
if icon_button(ui, icons::PENCIL_SIMPLE_LINE, "Draw brush (B)").clicked() {
|
||||
start_draw_brush_tool(world);
|
||||
}
|
||||
|
||||
toolbar_separator(ui);
|
||||
|
||||
|
||||
@@ -0,0 +1,350 @@
|
||||
//! Modal floor-polygon brush drawing tool.
|
||||
|
||||
use bevy::prelude::*;
|
||||
use bevy_egui::{egui, EguiContexts};
|
||||
use shared::{
|
||||
brush_math::validate_floor_polygon, ActorKind, BrushDesc, EditorVisibility, MaterialDesc,
|
||||
};
|
||||
|
||||
use crate::camera::EditorCamera;
|
||||
use crate::history::{spawn_with_history, EditorEntitySnapshot};
|
||||
use crate::operators::{ActiveOperator, OperatorPhase, OperatorStatus};
|
||||
use crate::scene_io::SceneIo;
|
||||
use crate::selection::ViewportClick;
|
||||
use crate::state::scene_tools_active;
|
||||
use crate::ui::{viewport_keyboard_shortcuts_active, UiState};
|
||||
use crate::viewport::{scene_view_ray, snap_translation, ViewportDisplayMode, ViewportSettings};
|
||||
|
||||
const DEFAULT_BRUSH_HEIGHT: f32 = 2.5;
|
||||
const MIN_COMMIT_VERTICES: usize = 3;
|
||||
|
||||
#[derive(Resource, Debug, Clone)]
|
||||
pub struct BrushToolState {
|
||||
pub active: bool,
|
||||
pub vertices: Vec<Vec3>,
|
||||
pub height: f32,
|
||||
}
|
||||
|
||||
impl Default for BrushToolState {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
active: false,
|
||||
vertices: Vec::new(),
|
||||
height: DEFAULT_BRUSH_HEIGHT,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl BrushToolState {
|
||||
pub fn start(&mut self) {
|
||||
self.active = true;
|
||||
self.vertices.clear();
|
||||
self.height = DEFAULT_BRUSH_HEIGHT;
|
||||
}
|
||||
|
||||
pub fn cancel(&mut self) {
|
||||
self.active = false;
|
||||
self.vertices.clear();
|
||||
}
|
||||
}
|
||||
|
||||
pub struct BrushToolPlugin;
|
||||
|
||||
impl Plugin for BrushToolPlugin {
|
||||
fn build(&self, app: &mut App) {
|
||||
app.init_resource::<BrushToolState>().add_systems(
|
||||
Update,
|
||||
(brush_tool_input, draw_brush_tool_preview).run_if(scene_tools_active),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn start_draw_brush_tool(world: &mut World) {
|
||||
world.resource_mut::<BrushToolState>().start();
|
||||
world.resource_mut::<SceneIo>().status =
|
||||
"Draw Brush: click floor points, Enter creates brush".to_string();
|
||||
if let Some(mut active_operator) = world.get_resource_mut::<ActiveOperator>() {
|
||||
set_brush_tool_status(
|
||||
&mut active_operator,
|
||||
OperatorPhase::Preview,
|
||||
"Click floor points, Enter creates brush, Esc cancels",
|
||||
);
|
||||
}
|
||||
if let Some(mut viewport_click) = world.get_resource_mut::<ViewportClick>() {
|
||||
viewport_click.0 = None;
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn brush_tool_input(
|
||||
mut commands: Commands,
|
||||
mut tool: ResMut<BrushToolState>,
|
||||
mut viewport_click: ResMut<ViewportClick>,
|
||||
mut active_operator: ResMut<ActiveOperator>,
|
||||
mut scene_io: ResMut<SceneIo>,
|
||||
keys: Res<ButtonInput<KeyCode>>,
|
||||
buttons: Res<ButtonInput<MouseButton>>,
|
||||
mut contexts: EguiContexts,
|
||||
ui_state: Res<UiState>,
|
||||
display: Res<ViewportDisplayMode>,
|
||||
settings: Res<ViewportSettings>,
|
||||
cameras: Query<(&Camera, &GlobalTransform), With<EditorCamera>>,
|
||||
) -> Result {
|
||||
if display.clean_game_view {
|
||||
if tool.active {
|
||||
tool.cancel();
|
||||
set_brush_tool_status(&mut active_operator, OperatorPhase::Canceled, "Canceled");
|
||||
}
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let ctx = contexts.ctx_mut()?;
|
||||
let egui_keyboard_busy = ctx.wants_keyboard_input();
|
||||
let keyboard_available =
|
||||
viewport_keyboard_shortcuts_active(&ui_state, ctx, &buttons) && !egui_keyboard_busy;
|
||||
|
||||
if keyboard_available && keys.just_pressed(KeyCode::KeyB) {
|
||||
tool.start();
|
||||
scene_io.status = "Draw Brush: click floor points, Enter creates brush".to_string();
|
||||
set_brush_tool_status(
|
||||
&mut active_operator,
|
||||
OperatorPhase::Preview,
|
||||
"Click floor points, Enter creates brush, Esc cancels",
|
||||
);
|
||||
viewport_click.0 = None;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if !tool.active {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if (!egui_keyboard_busy && keys.just_pressed(KeyCode::Escape))
|
||||
|| buttons.just_pressed(MouseButton::Right)
|
||||
{
|
||||
tool.cancel();
|
||||
viewport_click.0 = None;
|
||||
scene_io.status = "Draw Brush cancelled".to_string();
|
||||
set_brush_tool_status(&mut active_operator, OperatorPhase::Canceled, "Canceled");
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if !egui_keyboard_busy && keys.just_pressed(KeyCode::Backspace) {
|
||||
tool.vertices.pop();
|
||||
set_brush_tool_status(
|
||||
&mut active_operator,
|
||||
OperatorPhase::Preview,
|
||||
brush_tool_hint(tool.vertices.len()),
|
||||
);
|
||||
viewport_click.0 = None;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if let Some(pointer_pos) = viewport_click.0.take() {
|
||||
if let Some(mut point) =
|
||||
pointer_floor_position(&cameras, pointer_pos, ui_state.viewport_rect)
|
||||
{
|
||||
point = snap_translation(point, &settings);
|
||||
tool.vertices.push(point);
|
||||
scene_io.status = format!("Draw Brush: {} point(s)", tool.vertices.len());
|
||||
set_brush_tool_status(
|
||||
&mut active_operator,
|
||||
OperatorPhase::Preview,
|
||||
brush_tool_hint(tool.vertices.len()),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if !egui_keyboard_busy && keys.just_pressed(KeyCode::Enter) {
|
||||
match brush_snapshot_from_points(&tool.vertices, tool.height) {
|
||||
Ok(snapshot) => {
|
||||
commands.queue(move |world: &mut World| {
|
||||
spawn_with_history(world, snapshot);
|
||||
});
|
||||
tool.cancel();
|
||||
scene_io.status = "Brush created".to_string();
|
||||
set_brush_tool_status(
|
||||
&mut active_operator,
|
||||
OperatorPhase::Committed,
|
||||
"Committed brush.draw",
|
||||
);
|
||||
}
|
||||
Err(error) => {
|
||||
scene_io.status = format!("Draw Brush failed: {error}");
|
||||
set_brush_tool_status(&mut active_operator, OperatorPhase::Blocked, error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn draw_brush_tool_preview(
|
||||
tool: Res<BrushToolState>,
|
||||
ui_state: Res<UiState>,
|
||||
cameras: Query<(&Camera, &GlobalTransform), With<EditorCamera>>,
|
||||
mut gizmos: Gizmos,
|
||||
) {
|
||||
if !tool.active {
|
||||
return;
|
||||
}
|
||||
let mut points = tool.vertices.clone();
|
||||
if let Some(pointer_pos) = ui_state.viewport_pointer_pos {
|
||||
if let Some(point) = pointer_floor_position(&cameras, pointer_pos, ui_state.viewport_rect) {
|
||||
points.push(point);
|
||||
}
|
||||
}
|
||||
if points.is_empty() {
|
||||
return;
|
||||
}
|
||||
let color = Color::srgb(0.2, 0.72, 1.0);
|
||||
for point in &points {
|
||||
gizmos.sphere(*point + Vec3::Y * 0.02, 0.08, color);
|
||||
gizmos.line(*point, *point + Vec3::Y * tool.height, color);
|
||||
}
|
||||
for window in points.windows(2) {
|
||||
gizmos.line(window[0], window[1], color);
|
||||
gizmos.line(
|
||||
window[0] + Vec3::Y * tool.height,
|
||||
window[1] + Vec3::Y * tool.height,
|
||||
color,
|
||||
);
|
||||
}
|
||||
if points.len() >= MIN_COMMIT_VERTICES {
|
||||
let first = points[0];
|
||||
let last = *points.last().expect("points checked non-empty");
|
||||
gizmos.line(last, first, color);
|
||||
gizmos.line(
|
||||
last + Vec3::Y * tool.height,
|
||||
first + Vec3::Y * tool.height,
|
||||
color,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fn pointer_floor_position(
|
||||
cameras: &Query<(&Camera, &GlobalTransform), With<EditorCamera>>,
|
||||
pointer_pos: egui::Pos2,
|
||||
scene_rect: egui::Rect,
|
||||
) -> Option<Vec3> {
|
||||
let (camera, transform) = cameras
|
||||
.iter()
|
||||
.find(|(camera, _)| camera.is_active)
|
||||
.or_else(|| cameras.iter().next())?;
|
||||
let ray = scene_view_ray(camera, transform, pointer_pos, scene_rect)?;
|
||||
let direction = ray.direction.as_vec3();
|
||||
if direction.y.abs() < 0.0001 {
|
||||
return Some(ray.origin);
|
||||
}
|
||||
let t = -ray.origin.y / direction.y;
|
||||
Some(ray.origin + direction * t.max(0.0))
|
||||
}
|
||||
|
||||
fn brush_snapshot_from_points(
|
||||
points: &[Vec3],
|
||||
height: f32,
|
||||
) -> Result<EditorEntitySnapshot, String> {
|
||||
validate_floor_polygon(points).map_err(|error| format!("{error:?}"))?;
|
||||
let center = polygon_center(points);
|
||||
let local_points: Vec<Vec3> = points.iter().map(|point| *point - center).collect();
|
||||
let brush = BrushDesc::extruded_prism(&local_points, height)
|
||||
.ok_or_else(|| "invalid brush prism".to_string())?;
|
||||
Ok(EditorEntitySnapshot {
|
||||
actor_id: None,
|
||||
actor_kind: ActorKind::Brush,
|
||||
actor_name: None,
|
||||
name: Some("Brush".to_string()),
|
||||
transform: Transform::from_translation(center),
|
||||
primitive: None,
|
||||
brush: Some(brush),
|
||||
static_mesh_renderer: None,
|
||||
material: Some(MaterialDesc::default()),
|
||||
material_override: None,
|
||||
rigid_body: None,
|
||||
collider: None,
|
||||
physics: None,
|
||||
light: None,
|
||||
player_spawn: false,
|
||||
model: None,
|
||||
prefab: None,
|
||||
prefab_instance: None,
|
||||
weapon_spawn: None,
|
||||
trigger_volume: None,
|
||||
post_process_volume: None,
|
||||
team_spawn: None,
|
||||
objective: None,
|
||||
hierarchy_sibling_index: 0,
|
||||
editor_visibility: EditorVisibility::default(),
|
||||
children: Vec::new(),
|
||||
})
|
||||
}
|
||||
|
||||
fn polygon_center(points: &[Vec3]) -> Vec3 {
|
||||
let sum = points
|
||||
.iter()
|
||||
.copied()
|
||||
.fold(Vec3::ZERO, |sum, point| sum + point);
|
||||
sum / points.len() as f32
|
||||
}
|
||||
|
||||
fn brush_tool_hint(vertex_count: usize) -> String {
|
||||
match vertex_count {
|
||||
0 => "Click first floor point".to_string(),
|
||||
1 => "Click second floor point".to_string(),
|
||||
2 => "Click third floor point".to_string(),
|
||||
count => format!("{count} points, Enter creates brush"),
|
||||
}
|
||||
}
|
||||
|
||||
fn set_brush_tool_status(
|
||||
active_operator: &mut ActiveOperator,
|
||||
phase: OperatorPhase,
|
||||
hint: impl Into<String>,
|
||||
) {
|
||||
active_operator.status = Some(OperatorStatus {
|
||||
id: "brush.draw".to_string(),
|
||||
label: "Draw Brush".to_string(),
|
||||
phase,
|
||||
hint: hint.into(),
|
||||
warnings: Vec::new(),
|
||||
});
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn brush_snapshot_centers_polygon_points() {
|
||||
let snapshot = brush_snapshot_from_points(
|
||||
&[
|
||||
Vec3::new(0.0, 0.0, 0.0),
|
||||
Vec3::new(2.0, 0.0, 0.0),
|
||||
Vec3::new(2.0, 0.0, 2.0),
|
||||
Vec3::new(0.0, 0.0, 2.0),
|
||||
],
|
||||
3.0,
|
||||
)
|
||||
.expect("valid brush");
|
||||
|
||||
assert_eq!(snapshot.actor_kind, ActorKind::Brush);
|
||||
assert_eq!(snapshot.transform.translation, Vec3::new(1.0, 0.0, 1.0));
|
||||
assert!(snapshot.brush.is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn brush_snapshot_rejects_non_convex_polygon() {
|
||||
let result = brush_snapshot_from_points(
|
||||
&[
|
||||
Vec3::new(-1.0, 0.0, -1.0),
|
||||
Vec3::new(1.0, 0.0, -1.0),
|
||||
Vec3::new(0.0, 0.0, 0.0),
|
||||
Vec3::new(1.0, 0.0, 1.0),
|
||||
Vec3::new(-1.0, 0.0, 1.0),
|
||||
],
|
||||
2.0,
|
||||
);
|
||||
|
||||
assert!(result.is_err());
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
//! Viewport chrome, editor camera, selection, gizmos, and render views.
|
||||
|
||||
pub mod actor_icons;
|
||||
pub mod brush_tool;
|
||||
pub mod camera;
|
||||
pub mod gizmos;
|
||||
mod panel;
|
||||
@@ -12,5 +13,6 @@ pub mod viewport_mode;
|
||||
pub mod visualizers;
|
||||
|
||||
pub use actor_icons::ActorIconsPlugin;
|
||||
pub use brush_tool::{BrushToolPlugin, BrushToolState};
|
||||
pub use panel::*;
|
||||
pub use viewport_mode::EditorViewportMode;
|
||||
@@ -14,6 +14,7 @@ use crate::ui::hierarchy_ops::is_entity_locked;
|
||||
use crate::ui::hierarchy_state::HierarchyPanelState;
|
||||
use crate::ui::UiState;
|
||||
use crate::viewport::actor_icons::ActorIconProxy;
|
||||
use crate::viewport::brush_tool::BrushToolState;
|
||||
use crate::viewport::ViewportDisplayMode;
|
||||
use crate::visualizers::EditorVisualizerProxy;
|
||||
use bevy_egui::egui;
|
||||
@@ -102,6 +103,7 @@ fn handle_pick_events(
|
||||
keys: Res<ButtonInput<KeyCode>>,
|
||||
buttons: Res<ButtonInput<MouseButton>>,
|
||||
display: Res<ViewportDisplayMode>,
|
||||
brush_tool: Res<BrushToolState>,
|
||||
gizmo_targets: Query<&GizmoTarget>,
|
||||
hierarchy: Option<Res<HierarchyPanelState>>,
|
||||
) -> Result {
|
||||
@@ -122,6 +124,10 @@ fn handle_pick_events(
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if brush_tool.active {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if gizmo_targets
|
||||
.iter()
|
||||
.any(|g| GizmoTarget::is_focused(g) || GizmoTarget::is_active(g))
|
||||
|
||||
Reference in new issue
Block a user