Build production-ready editor authoring workflows
CI / Format, lint, test, build (push) Waiting to run
CI / Format, lint, test, build (push) Waiting to run
This commit is contained in:
1 parent
cc1fa6ea3b
commit
0553a85220
163 files changed
+34547
-1565
No files matched your search
@@ -7,12 +7,15 @@ use egui_phosphor_icons::icons;
|
||||
use transform_gizmo_bevy::prelude::GizmoOptions;
|
||||
|
||||
use crate::assets::operators::{
|
||||
apply_material_operator, apply_texture_operator, place_asset_operator, place_subasset_operator,
|
||||
apply_material_operator, apply_texture_operator, assign_animation_clip_operator,
|
||||
assign_audio_clip_operator, place_asset_operator, place_subasset_operator,
|
||||
};
|
||||
use crate::assets::thumbnails::kind_icon;
|
||||
use crate::assets::{AssetSelection, AssetSubAssetKind, EditorAssets};
|
||||
use crate::camera::EditorCamera;
|
||||
use crate::gizmos::{EditorGizmoMode, EditorGizmoSpace};
|
||||
use crate::render_target::ViewportRenderTarget;
|
||||
use crate::selection::ViewportClick;
|
||||
use crate::selection::{ViewportClick, ViewportPickStack};
|
||||
use crate::state::PlayPossession;
|
||||
use crate::viewport::actor_icons::ActorIconSettings;
|
||||
use crate::viewport::brush_edit::{BrushEditMode, BrushElementSelection};
|
||||
@@ -25,8 +28,13 @@ use crate::viewport::{
|
||||
use super::helpers::{
|
||||
focus_editor_camera_on_selection, viewport_recall_bookmark, viewport_save_bookmark,
|
||||
};
|
||||
use super::theme::viewport_toolbar_frame;
|
||||
use super::widgets::{icon_button_small, panel_toolbar_row, tool_button};
|
||||
use super::theme::{
|
||||
overlay_chip_frame, viewport_toolbar_frame, ACCENT, ACCENT_HOVER, AXIS_X, AXIS_Y, AXIS_Z,
|
||||
BORDER, BORDER_STRONG, ELEVATED_BG, SELECTION, SUCCESS, TEXT, TEXT_DIM, TEXT_MUTED, WARNING,
|
||||
};
|
||||
use super::widgets::{
|
||||
icon_button_small, panel_toolbar_row, phosphor_icon, tool_button, tool_button_accent,
|
||||
};
|
||||
|
||||
#[derive(Resource, Default)]
|
||||
pub struct ViewportUiState {
|
||||
@@ -97,6 +105,19 @@ pub fn viewport_tab_ui(
|
||||
egui::Rect::from_min_max(egui::pos2(0.0, 0.0), egui::pos2(1.0, 1.0)),
|
||||
egui::Color32::WHITE,
|
||||
);
|
||||
painter.rect_stroke(
|
||||
rect,
|
||||
0.0,
|
||||
egui::Stroke::new(
|
||||
1.0,
|
||||
if response.hovered() {
|
||||
BORDER_STRONG
|
||||
} else {
|
||||
BORDER
|
||||
},
|
||||
),
|
||||
egui::StrokeKind::Inside,
|
||||
);
|
||||
} else {
|
||||
ui.allocate_rect(rect, egui::Sense::hover());
|
||||
ui.scope_builder(egui::UiBuilder::new().max_rect(rect), |ui| {
|
||||
@@ -114,35 +135,49 @@ pub fn viewport_tab_ui(
|
||||
}
|
||||
|
||||
scene_view_overlay_toolbar(world, ui.ctx(), rect);
|
||||
scene_view_selection_hud(world, ui.ctx(), rect, selected_entities);
|
||||
scene_view_brush_draw_hints(world, ui.ctx(), rect);
|
||||
scene_view_mode_badge(world, ui.ctx(), rect);
|
||||
scene_view_render_badge(world, ui.ctx(), rect);
|
||||
scene_view_brush_mode_badge(world, ui.ctx(), rect);
|
||||
scene_view_gi_badge(world, ui.ctx(), rect);
|
||||
scene_view_volume_hud(world, ui.ctx(), rect);
|
||||
scene_view_orientation_widget(world, ui.ctx(), rect);
|
||||
viewport_asset_drop_ui(world, ui, rect, selected_entities);
|
||||
}
|
||||
|
||||
fn scene_view_mode_badge(world: &World, ctx: &egui::Context, scene_rect: egui::Rect) {
|
||||
fn scene_view_render_badge(world: &World, ctx: &egui::Context, scene_rect: egui::Rect) {
|
||||
let Some(mode) = world.get_resource::<EditorViewportMode>() else {
|
||||
return;
|
||||
};
|
||||
let mode = *mode;
|
||||
let (label, color) = match mode {
|
||||
EditorViewportMode::Lit => ("Lit", egui::Color32::from_rgb(120, 200, 120)),
|
||||
EditorViewportMode::Unlit => ("Unlit", egui::Color32::from_rgb(200, 200, 120)),
|
||||
EditorViewportMode::Collider => ("Collider", egui::Color32::from_rgb(220, 140, 80)),
|
||||
EditorViewportMode::Lit => ("Lit", SUCCESS),
|
||||
EditorViewportMode::Unlit => ("Unlit", WARNING),
|
||||
EditorViewportMode::Collider => ("Collider", WARNING),
|
||||
};
|
||||
|
||||
egui::Area::new(egui::Id::new("scene_view_mode_badge"))
|
||||
.fixed_pos(scene_rect.right_bottom() + egui::vec2(-72.0, -22.0))
|
||||
let profile = world.get_resource::<settings::ActiveCameraRenderProfile>();
|
||||
let (gi_label, gi_color) = match profile.map(|profile| profile.gi_path) {
|
||||
Some(settings::GiPath::SolariDeferred) => ("Solari", ACCENT),
|
||||
_ => ("Forward", SELECTION),
|
||||
};
|
||||
|
||||
egui::Area::new(egui::Id::new("scene_view_render_badge"))
|
||||
.fixed_pos(scene_rect.right_bottom() + egui::vec2(-10.0, -10.0))
|
||||
.pivot(egui::Align2::RIGHT_BOTTOM)
|
||||
.interactable(false)
|
||||
.show(ctx, |ui| {
|
||||
egui::Frame::NONE
|
||||
.fill(egui::Color32::from_black_alpha(160))
|
||||
.inner_margin(egui::Margin::symmetric(8, 4))
|
||||
.show(ui, |ui| {
|
||||
ui.colored_label(color, label);
|
||||
overlay_chip_frame().show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(egui::RichText::new(label).color(color).strong().small());
|
||||
ui.label(egui::RichText::new("/").color(TEXT_MUTED).small());
|
||||
ui.label(
|
||||
egui::RichText::new(gi_label)
|
||||
.color(gi_color)
|
||||
.strong()
|
||||
.small(),
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
if mode == EditorViewportMode::Collider {
|
||||
@@ -150,10 +185,13 @@ fn scene_view_mode_badge(world: &World, ctx: &egui::Context, scene_rect: egui::R
|
||||
.fixed_pos(scene_rect.left_bottom() + egui::vec2(8.0, -28.0))
|
||||
.interactable(false)
|
||||
.show(ctx, |ui| {
|
||||
ui.colored_label(
|
||||
egui::Color32::from_rgb(255, 180, 100),
|
||||
"Meshes hidden - switch to Lit (sun icon) for shading",
|
||||
);
|
||||
overlay_chip_frame().show(ui, |ui| {
|
||||
ui.label(
|
||||
egui::RichText::new("Collider view / meshes hidden")
|
||||
.color(WARNING)
|
||||
.small(),
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -173,51 +211,39 @@ fn scene_view_brush_mode_badge(world: &World, ctx: &egui::Context, scene_rect: e
|
||||
.fixed_pos(scene_rect.left_top() + egui::vec2(8.0, 52.0))
|
||||
.interactable(false)
|
||||
.show(ctx, |ui| {
|
||||
egui::Frame::new()
|
||||
.fill(egui::Color32::from_rgba_unmultiplied(20, 18, 28, 230))
|
||||
.stroke(egui::Stroke::new(
|
||||
1.0,
|
||||
egui::Color32::from_rgba_unmultiplied(210, 140, 255, 210),
|
||||
))
|
||||
.corner_radius(egui::CornerRadius::same(4))
|
||||
.inner_margin(egui::Margin::symmetric(8, 6))
|
||||
.show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(
|
||||
egui::RichText::new(format!("Brush {}", mode.label()))
|
||||
.color(egui::Color32::from_rgb(230, 190, 255))
|
||||
.strong(),
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new(format!("{selected_count} selected"))
|
||||
.color(egui::Color32::from_rgb(205, 200, 215))
|
||||
.small(),
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new("Element gizmo")
|
||||
.color(egui::Color32::from_rgb(255, 190, 120))
|
||||
.small(),
|
||||
);
|
||||
});
|
||||
ui.add_space(4.0);
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
match mode {
|
||||
BrushEditMode::Vertex => key_hint(ui, "LMB", "Select vertex"),
|
||||
BrushEditMode::Edge => key_hint(ui, "LMB", "Select edge"),
|
||||
BrushEditMode::Face => key_hint(ui, "LMB", "Select face"),
|
||||
BrushEditMode::Clip => key_hint(ui, "LMB", "Select face"),
|
||||
BrushEditMode::Object => {}
|
||||
}
|
||||
if !matches!(mode, BrushEditMode::Clip) {
|
||||
key_hint(ui, "W/E/R", "Move/rotate/scale");
|
||||
}
|
||||
if matches!(mode, BrushEditMode::Clip) {
|
||||
key_hint(ui, "Enter", "Clip");
|
||||
}
|
||||
key_hint(ui, "Shift+LMB", "Multi");
|
||||
key_hint(ui, "Esc", "Object");
|
||||
});
|
||||
overlay_chip_frame().show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(
|
||||
egui::RichText::new(format!("Brush {}", mode.label()))
|
||||
.color(ACCENT)
|
||||
.strong(),
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new(format!("{selected_count} selected"))
|
||||
.color(SELECTION)
|
||||
.small(),
|
||||
);
|
||||
ui.label(egui::RichText::new("Element gizmo").color(SUCCESS).small());
|
||||
});
|
||||
ui.add_space(4.0);
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
match mode {
|
||||
BrushEditMode::Vertex => key_hint(ui, "LMB", "Select vertex"),
|
||||
BrushEditMode::Edge => key_hint(ui, "LMB", "Select edge"),
|
||||
BrushEditMode::Face => key_hint(ui, "LMB", "Select face"),
|
||||
BrushEditMode::Clip => key_hint(ui, "LMB", "Select face"),
|
||||
BrushEditMode::Object => {}
|
||||
}
|
||||
if !matches!(mode, BrushEditMode::Clip) {
|
||||
key_hint(ui, "W/E/R", "Move/rotate/scale");
|
||||
}
|
||||
if matches!(mode, BrushEditMode::Clip) {
|
||||
key_hint(ui, "Enter", "Clip");
|
||||
}
|
||||
key_hint(ui, "Shift+LMB", "Multi");
|
||||
key_hint(ui, "Esc", "Object");
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -237,51 +263,35 @@ fn scene_view_brush_draw_hints(world: &World, ctx: &egui::Context, scene_rect: e
|
||||
.fixed_pos(scene_rect.left_top() + egui::vec2(8.0, 52.0))
|
||||
.interactable(false)
|
||||
.show(ctx, |ui| {
|
||||
egui::Frame::new()
|
||||
.fill(egui::Color32::from_rgba_unmultiplied(18, 22, 26, 220))
|
||||
.stroke(egui::Stroke::new(
|
||||
1.0,
|
||||
egui::Color32::from_rgba_unmultiplied(95, 150, 190, 180),
|
||||
))
|
||||
.corner_radius(egui::CornerRadius::same(4))
|
||||
.inner_margin(egui::Margin::symmetric(8, 6))
|
||||
.show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(
|
||||
egui::RichText::new("Draw Brush")
|
||||
.color(egui::Color32::from_rgb(170, 220, 255))
|
||||
.strong(),
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new(format!("{} pts", tool.vertices.len()))
|
||||
.color(egui::Color32::from_rgb(190, 200, 205))
|
||||
.small(),
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new(hint)
|
||||
.color(egui::Color32::from_rgb(150, 220, 170))
|
||||
.small(),
|
||||
);
|
||||
});
|
||||
ui.add_space(4.0);
|
||||
ui.horizontal_wrapped(|ui| match tool.phase {
|
||||
BrushToolPhase::Outline => {
|
||||
key_hint(ui, "LMB", "Point");
|
||||
key_hint(ui, "Enter", "Height");
|
||||
key_hint(ui, "Backspace", "Remove");
|
||||
key_hint(ui, "Esc", "Cancel");
|
||||
key_hint(ui, "RMB", "Cancel");
|
||||
}
|
||||
BrushToolPhase::Height => {
|
||||
key_hint(ui, "Mouse Up/Down", "Height");
|
||||
key_hint(ui, "Enter", "Create");
|
||||
key_hint(ui, "LMB", "Create");
|
||||
key_hint(ui, "Backspace", "Outline");
|
||||
key_hint(ui, "Esc", "Cancel");
|
||||
key_hint(ui, "RMB", "Cancel");
|
||||
}
|
||||
});
|
||||
overlay_chip_frame().show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(egui::RichText::new("Draw Brush").color(SELECTION).strong());
|
||||
ui.label(
|
||||
egui::RichText::new(format!("{} pts", tool.vertices.len()))
|
||||
.color(TEXT_DIM)
|
||||
.small(),
|
||||
);
|
||||
ui.label(egui::RichText::new(hint).color(SUCCESS).small());
|
||||
});
|
||||
ui.add_space(4.0);
|
||||
ui.horizontal_wrapped(|ui| match tool.phase {
|
||||
BrushToolPhase::Outline => {
|
||||
key_hint(ui, "LMB", "Point");
|
||||
key_hint(ui, "Enter", "Height");
|
||||
key_hint(ui, "Backspace", "Remove");
|
||||
key_hint(ui, "Esc", "Cancel");
|
||||
key_hint(ui, "RMB", "Cancel");
|
||||
}
|
||||
BrushToolPhase::Height => {
|
||||
key_hint(ui, "Mouse Up/Down", "Height");
|
||||
key_hint(ui, "Enter", "Create");
|
||||
key_hint(ui, "LMB", "Create");
|
||||
key_hint(ui, "Backspace", "Outline");
|
||||
key_hint(ui, "Esc", "Cancel");
|
||||
key_hint(ui, "RMB", "Cancel");
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -290,35 +300,149 @@ fn key_hint(ui: &mut egui::Ui, key: &str, label: &str) {
|
||||
ui.label(
|
||||
egui::RichText::new(key)
|
||||
.monospace()
|
||||
.color(egui::Color32::from_rgb(232, 238, 242))
|
||||
.background_color(egui::Color32::from_rgba_unmultiplied(45, 52, 58, 220)),
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new(label)
|
||||
.color(egui::Color32::from_rgb(190, 200, 205))
|
||||
.small(),
|
||||
.color(TEXT)
|
||||
.background_color(ELEVATED_BG),
|
||||
);
|
||||
ui.label(egui::RichText::new(label).color(TEXT_DIM).small());
|
||||
});
|
||||
}
|
||||
|
||||
fn scene_view_gi_badge(world: &World, ctx: &egui::Context, scene_rect: egui::Rect) {
|
||||
let Some(profile) = world.get_resource::<settings::ActiveCameraRenderProfile>() else {
|
||||
fn scene_view_selection_hud(
|
||||
world: &World,
|
||||
ctx: &egui::Context,
|
||||
scene_rect: egui::Rect,
|
||||
selected_entities: &SelectedEntities,
|
||||
) {
|
||||
let Some(&primary) = selected_entities.as_slice().first() else {
|
||||
return;
|
||||
};
|
||||
let (label, color) = match profile.gi_path {
|
||||
settings::GiPath::Forward => ("Forward", egui::Color32::from_rgb(140, 180, 255)),
|
||||
settings::GiPath::SolariDeferred => ("Solari", egui::Color32::from_rgb(255, 170, 90)),
|
||||
let name = world
|
||||
.get::<Name>(primary)
|
||||
.map(|name| name.as_str().to_string())
|
||||
.unwrap_or_else(|| "Selected entity".to_string());
|
||||
let kind = world
|
||||
.get::<shared::ActorKind>(primary)
|
||||
.map(|kind| format!("{kind:?}"))
|
||||
.unwrap_or_else(|| "Entity".to_string());
|
||||
let count = selected_entities.len();
|
||||
let selection_detail = if count > 1 {
|
||||
format!("{kind} / {count} selected")
|
||||
} else {
|
||||
kind
|
||||
};
|
||||
egui::Area::new(egui::Id::new("scene_view_gi_badge"))
|
||||
.fixed_pos(scene_rect.right_bottom() + egui::vec2(-148.0, -22.0))
|
||||
|
||||
let pick_detail = world.get_resource::<ViewportPickStack>().and_then(|stack| {
|
||||
(stack.entities.len() > 1 && stack.entities.contains(&primary)).then(|| {
|
||||
format!(
|
||||
"Pick {}/{}",
|
||||
stack.index.min(stack.entities.len() - 1) + 1,
|
||||
stack.entities.len()
|
||||
)
|
||||
})
|
||||
});
|
||||
let top_offset = if scene_rect.width() < 1100.0 {
|
||||
50.0
|
||||
} else {
|
||||
10.0
|
||||
};
|
||||
|
||||
egui::Area::new(egui::Id::new("scene_view_selection_hud"))
|
||||
.fixed_pos(scene_rect.right_top() + egui::vec2(-10.0, top_offset))
|
||||
.pivot(egui::Align2::RIGHT_TOP)
|
||||
.interactable(false)
|
||||
.show(ctx, |ui| {
|
||||
egui::Frame::NONE
|
||||
.fill(egui::Color32::from_black_alpha(160))
|
||||
.inner_margin(egui::Margin::symmetric(8, 4))
|
||||
.show(ui, |ui| {
|
||||
ui.colored_label(color, label);
|
||||
overlay_chip_frame().show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(phosphor_icon(icons::CROSSHAIR, 17.0).color(SELECTION));
|
||||
ui.vertical(|ui| {
|
||||
ui.set_max_width(260.0);
|
||||
ui.add(
|
||||
egui::Label::new(egui::RichText::new(&name).color(TEXT).strong())
|
||||
.truncate(),
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new(&selection_detail)
|
||||
.color(TEXT_DIM)
|
||||
.small(),
|
||||
);
|
||||
});
|
||||
if let Some(pick_detail) = pick_detail {
|
||||
ui.separator();
|
||||
ui.label(
|
||||
egui::RichText::new(pick_detail)
|
||||
.color(ACCENT)
|
||||
.monospace()
|
||||
.small(),
|
||||
);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
fn scene_view_orientation_widget(world: &mut World, ctx: &egui::Context, scene_rect: egui::Rect) {
|
||||
let rotation = {
|
||||
let mut cameras = world.query_filtered::<(&Camera, &GlobalTransform), With<EditorCamera>>();
|
||||
let mut rotation = None;
|
||||
for (camera, transform) in cameras.iter(world) {
|
||||
rotation.get_or_insert(transform.rotation());
|
||||
if camera.is_active {
|
||||
rotation = Some(transform.rotation());
|
||||
break;
|
||||
}
|
||||
}
|
||||
rotation
|
||||
};
|
||||
let Some(rotation) = rotation else {
|
||||
return;
|
||||
};
|
||||
|
||||
egui::Area::new(egui::Id::new("scene_view_orientation_widget"))
|
||||
.fixed_pos(scene_rect.right_bottom() + egui::vec2(-10.0, -48.0))
|
||||
.pivot(egui::Align2::RIGHT_BOTTOM)
|
||||
.interactable(false)
|
||||
.show(ctx, |ui| {
|
||||
overlay_chip_frame().show(ui, |ui| {
|
||||
let (rect, _) =
|
||||
ui.allocate_exact_size(egui::vec2(72.0, 72.0), egui::Sense::hover());
|
||||
let painter = ui.painter_at(rect);
|
||||
let center = rect.center();
|
||||
painter.circle_filled(center, 4.0, egui::Color32::from_rgb(210, 214, 219));
|
||||
|
||||
let view_rotation = rotation.inverse();
|
||||
let mut axes = [
|
||||
("X", view_rotation * Vec3::X, AXIS_X),
|
||||
("Y", view_rotation * Vec3::Y, AXIS_Y),
|
||||
("Z", view_rotation * Vec3::Z, AXIS_Z),
|
||||
];
|
||||
axes.sort_by(|left, right| {
|
||||
left.1
|
||||
.z
|
||||
.partial_cmp(&right.1.z)
|
||||
.unwrap_or(std::cmp::Ordering::Equal)
|
||||
});
|
||||
for (label, axis, color) in axes {
|
||||
let endpoint = center + egui::vec2(axis.x, -axis.y) * 27.0;
|
||||
let facing = axis.z <= 0.0;
|
||||
let color = if facing {
|
||||
color
|
||||
} else {
|
||||
color.gamma_multiply(0.48)
|
||||
};
|
||||
painter.line_segment(
|
||||
[center, endpoint],
|
||||
egui::Stroke::new(if facing { 2.2 } else { 1.2 }, color),
|
||||
);
|
||||
painter.circle_filled(endpoint, if facing { 9.0 } else { 7.0 }, color);
|
||||
painter.text(
|
||||
endpoint,
|
||||
egui::Align2::CENTER_CENTER,
|
||||
label,
|
||||
egui::FontId::monospace(10.0),
|
||||
egui::Color32::from_rgb(18, 20, 22),
|
||||
);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -333,17 +457,26 @@ fn scene_view_volume_hud(world: &World, ctx: &egui::Context, scene_rect: egui::R
|
||||
.fixed_pos(scene_rect.left_bottom() + egui::vec2(8.0, -56.0))
|
||||
.interactable(false)
|
||||
.show(ctx, |ui| {
|
||||
egui::Frame::NONE
|
||||
.fill(egui::Color32::from_black_alpha(150))
|
||||
.inner_margin(egui::Margin::symmetric(8, 4))
|
||||
.show(ui, |ui| {
|
||||
ui.label(format!(
|
||||
"Volume: {} ({:.0}%, {} overrides)",
|
||||
primary.label,
|
||||
primary.weight * 100.0,
|
||||
primary.override_count
|
||||
));
|
||||
overlay_chip_frame().show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(phosphor_icon(icons::CUBE, 14.0).color(SELECTION));
|
||||
ui.label(
|
||||
egui::RichText::new(&primary.label)
|
||||
.color(TEXT)
|
||||
.strong()
|
||||
.small(),
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new(format!(
|
||||
"{:.0}% / {} overrides",
|
||||
primary.weight * 100.0,
|
||||
primary.override_count
|
||||
))
|
||||
.color(TEXT_DIM)
|
||||
.small(),
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -358,7 +491,7 @@ fn scene_view_overlay_toolbar(world: &mut World, ctx: &egui::Context, scene_rect
|
||||
viewport_toolbar_frame().show(ui, |ui| {
|
||||
panel_toolbar_row(ui, |ui| {
|
||||
let gizmo_mode = *world.resource::<crate::gizmos::EditorGizmoMode>();
|
||||
if tool_button(
|
||||
if tool_button_accent(
|
||||
ui,
|
||||
icons::ARROWS_OUT_CARDINAL,
|
||||
gizmo_mode == EditorGizmoMode::Translate,
|
||||
@@ -368,7 +501,7 @@ fn scene_view_overlay_toolbar(world: &mut World, ctx: &egui::Context, scene_rect
|
||||
{
|
||||
super::helpers::set_gizmo_mode(world, EditorGizmoMode::Translate);
|
||||
}
|
||||
if tool_button(
|
||||
if tool_button_accent(
|
||||
ui,
|
||||
icons::ARROWS_CLOCKWISE,
|
||||
gizmo_mode == EditorGizmoMode::Rotate,
|
||||
@@ -378,7 +511,7 @@ fn scene_view_overlay_toolbar(world: &mut World, ctx: &egui::Context, scene_rect
|
||||
{
|
||||
super::helpers::set_gizmo_mode(world, EditorGizmoMode::Rotate);
|
||||
}
|
||||
if tool_button(
|
||||
if tool_button_accent(
|
||||
ui,
|
||||
icons::ARROWS_IN_LINE_HORIZONTAL,
|
||||
gizmo_mode == EditorGizmoMode::Scale,
|
||||
@@ -459,6 +592,14 @@ fn scene_view_overlay_toolbar(world: &mut World, ctx: &egui::Context, scene_rect
|
||||
if tool_button(ui, icons::MAGNET, snap, "Snap translation").clicked() {
|
||||
settings.snap_translate = !settings.snap_translate;
|
||||
}
|
||||
if settings.snap_translate {
|
||||
ui.label(
|
||||
egui::RichText::new(format!("{:.2}m", settings.snap_increment))
|
||||
.color(SELECTION)
|
||||
.monospace()
|
||||
.small(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(mut visualizers) =
|
||||
@@ -532,7 +673,8 @@ fn scene_options_popover(
|
||||
ui.checkbox(&mut settings.snap_translate, "Snap translation");
|
||||
ui.add(
|
||||
egui::Slider::new(&mut settings.snap_increment, 0.25..=4.0)
|
||||
.text("Snap step"),
|
||||
.text("Snap step")
|
||||
.suffix(" m"),
|
||||
);
|
||||
}
|
||||
if let Some(mut gizmo_options) = world.get_resource_mut::<GizmoOptions>() {
|
||||
@@ -564,6 +706,7 @@ fn scene_options_popover(
|
||||
ui.checkbox(&mut visualizers.show_actor_icon_actor, "Actors");
|
||||
ui.checkbox(&mut visualizers.show_actor_icon_mesh, "Meshes");
|
||||
ui.checkbox(&mut visualizers.show_actor_icon_light, "Lights");
|
||||
ui.checkbox(&mut visualizers.show_actor_icon_audio, "Audio");
|
||||
ui.checkbox(&mut visualizers.show_actor_icon_physics, "Physics");
|
||||
ui.checkbox(&mut visualizers.show_actor_icon_gameplay, "Gameplay");
|
||||
ui.checkbox(&mut visualizers.show_actor_icon_volume, "Volumes");
|
||||
@@ -578,7 +721,10 @@ fn scene_options_popover(
|
||||
ui.separator();
|
||||
ui.checkbox(&mut visualizers.show_colliders, "Colliders");
|
||||
ui.checkbox(&mut visualizers.show_lights, "Lights");
|
||||
ui.checkbox(&mut visualizers.show_audio, "Audio ranges");
|
||||
ui.checkbox(&mut visualizers.show_spawns, "Player spawns");
|
||||
ui.checkbox(&mut visualizers.show_gameplay, "Gameplay markers");
|
||||
ui.checkbox(&mut visualizers.show_volumes, "Volumes");
|
||||
ui.checkbox(
|
||||
&mut visualizers.show_prefab_model_anchors,
|
||||
"Prefab/model anchors",
|
||||
@@ -669,29 +815,74 @@ fn viewport_asset_drop_ui(
|
||||
viewport_rect: egui::Rect,
|
||||
selected: &SelectedEntities,
|
||||
) {
|
||||
let pointer_pos = ui.input(|input| input.pointer.hover_pos());
|
||||
let drag_selection = world
|
||||
.resource::<EditorAssets>()
|
||||
.dragging_selection()
|
||||
.cloned();
|
||||
let drag_descriptor = drag_selection
|
||||
.as_ref()
|
||||
.and_then(|selection| asset_drag_descriptor(world, selection, selected));
|
||||
let over_viewport = pointer_pos.is_some_and(|pos| viewport_rect.contains(pos));
|
||||
|
||||
if let (Some(pointer), Some((icon, label, action))) = (pointer_pos, drag_descriptor.as_ref()) {
|
||||
draw_asset_drag_preview(
|
||||
ui,
|
||||
viewport_rect,
|
||||
pointer,
|
||||
*icon,
|
||||
label,
|
||||
action,
|
||||
over_viewport,
|
||||
);
|
||||
}
|
||||
|
||||
if drag_selection.is_some() && over_viewport {
|
||||
ui.painter().rect_stroke(
|
||||
viewport_rect.shrink(2.0),
|
||||
0.0,
|
||||
egui::Stroke::new(2.0, ACCENT_HOVER),
|
||||
egui::StrokeKind::Inside,
|
||||
);
|
||||
}
|
||||
|
||||
let pointer_released = ui.input(|input| input.pointer.any_released());
|
||||
if !pointer_released {
|
||||
return;
|
||||
}
|
||||
|
||||
let pointer_pos = ui.input(|input| input.pointer.hover_pos());
|
||||
if !pointer_pos.is_some_and(|pos| viewport_rect.contains(pos)) {
|
||||
world.resource_mut::<EditorAssets>().clear_drag();
|
||||
return;
|
||||
}
|
||||
|
||||
let selection = {
|
||||
let assets = world.resource::<EditorAssets>();
|
||||
assets.dragging_selection().cloned()
|
||||
};
|
||||
world.resource_mut::<EditorAssets>().clear_drag();
|
||||
|
||||
let Some(selection) = selection else {
|
||||
let Some(selection) = drag_selection else {
|
||||
return;
|
||||
};
|
||||
let placement = viewport_ground_position(world, pointer_pos.unwrap(), viewport_rect)
|
||||
.map(|pos| snap_translation(pos, world.resource::<ViewportSettings>()))
|
||||
.unwrap_or(Vec3::ZERO);
|
||||
if matches!(
|
||||
selection,
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::AnimationClip,
|
||||
..
|
||||
}
|
||||
) {
|
||||
if let Some(entity) = selected
|
||||
.as_slice()
|
||||
.iter()
|
||||
.copied()
|
||||
.find(|entity| world.get::<shared::ModelRef>(*entity).is_some())
|
||||
{
|
||||
assign_animation_clip_operator(world, selection, entity);
|
||||
} else {
|
||||
place_subasset_operator(world, selection, placement);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if matches!(
|
||||
selection,
|
||||
AssetSelection::SubAsset {
|
||||
@@ -702,6 +893,15 @@ fn viewport_asset_drop_ui(
|
||||
place_subasset_operator(world, selection, placement);
|
||||
return;
|
||||
}
|
||||
if matches!(
|
||||
selection,
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::Skeleton,
|
||||
..
|
||||
}
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
if let AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::Texture,
|
||||
@@ -730,6 +930,19 @@ fn viewport_asset_drop_ui(
|
||||
let Some(asset) = asset else {
|
||||
return;
|
||||
};
|
||||
if matches!(asset.kind, crate::assets::EditorAssetKind::AudioClip) {
|
||||
if let Some(entity) = selected
|
||||
.as_slice()
|
||||
.iter()
|
||||
.copied()
|
||||
.find(|entity| world.get::<shared::AudioSourceDesc>(*entity).is_some())
|
||||
{
|
||||
assign_audio_clip_operator(world, asset, entity);
|
||||
} else {
|
||||
place_asset_operator(world, asset, placement);
|
||||
}
|
||||
return;
|
||||
}
|
||||
match asset.kind {
|
||||
crate::assets::EditorAssetKind::Texture => {
|
||||
apply_texture_operator(world, asset, selected);
|
||||
@@ -744,3 +957,204 @@ fn viewport_asset_drop_ui(
|
||||
|
||||
place_asset_operator(world, asset, placement);
|
||||
}
|
||||
|
||||
fn asset_drag_descriptor(
|
||||
world: &World,
|
||||
selection: &AssetSelection,
|
||||
selected: &SelectedEntities,
|
||||
) -> Option<(egui_phosphor_icons::Icon, String, String)> {
|
||||
let assets = world.resource::<EditorAssets>();
|
||||
let asset = assets.asset_for_selection(selection)?;
|
||||
let icon = match selection {
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::Mesh,
|
||||
..
|
||||
} => icons::CUBE,
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::Material,
|
||||
..
|
||||
} => icons::PAINT_BRUSH,
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::Texture,
|
||||
..
|
||||
} => icons::IMAGE,
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::Skeleton,
|
||||
..
|
||||
} => icons::BONE,
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::AnimationClip,
|
||||
..
|
||||
} => icons::FILM_STRIP,
|
||||
_ => kind_icon(&asset.kind),
|
||||
};
|
||||
let label = match selection {
|
||||
AssetSelection::SubAsset { label, .. } => label.clone(),
|
||||
_ => asset.label.clone(),
|
||||
};
|
||||
let action = match selection {
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::Texture,
|
||||
..
|
||||
} if !selected.is_empty() => "Apply texture to selection",
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::Material,
|
||||
..
|
||||
} if !selected.is_empty() => "Apply material to selection",
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::Skeleton,
|
||||
..
|
||||
} => "Inspect skeleton",
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::AnimationClip,
|
||||
..
|
||||
} if selected
|
||||
.as_slice()
|
||||
.iter()
|
||||
.any(|entity| world.get::<shared::ModelRef>(*entity).is_some()) =>
|
||||
{
|
||||
"Assign clip to animated actor"
|
||||
}
|
||||
AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::AnimationClip,
|
||||
..
|
||||
} => "Create animated actor",
|
||||
_ => match asset.kind {
|
||||
crate::assets::EditorAssetKind::Texture if !selected.is_empty() => {
|
||||
"Apply texture to selection"
|
||||
}
|
||||
crate::assets::EditorAssetKind::Material if !selected.is_empty() => {
|
||||
"Apply material to selection"
|
||||
}
|
||||
crate::assets::EditorAssetKind::AudioClip
|
||||
if selected
|
||||
.as_slice()
|
||||
.iter()
|
||||
.any(|entity| world.get::<shared::AudioSourceDesc>(*entity).is_some()) =>
|
||||
{
|
||||
"Assign clip to audio source"
|
||||
}
|
||||
crate::assets::EditorAssetKind::AudioClip => "Create audio source",
|
||||
_ => "Place in scene",
|
||||
},
|
||||
};
|
||||
Some((icon, label, action.to_string()))
|
||||
}
|
||||
|
||||
fn draw_asset_drag_preview(
|
||||
ui: &egui::Ui,
|
||||
viewport_rect: egui::Rect,
|
||||
pointer: egui::Pos2,
|
||||
icon: egui_phosphor_icons::Icon,
|
||||
label: &str,
|
||||
action: &str,
|
||||
over_viewport: bool,
|
||||
) {
|
||||
if over_viewport {
|
||||
let painter = ui.painter();
|
||||
painter.circle_filled(pointer, 3.0, ACCENT_HOVER);
|
||||
painter.circle_stroke(pointer, 11.0, egui::Stroke::new(1.5, ACCENT_HOVER));
|
||||
painter.line_segment(
|
||||
[
|
||||
pointer - egui::vec2(17.0, 0.0),
|
||||
pointer - egui::vec2(7.0, 0.0),
|
||||
],
|
||||
egui::Stroke::new(1.5, ACCENT_HOVER),
|
||||
);
|
||||
painter.line_segment(
|
||||
[
|
||||
pointer + egui::vec2(7.0, 0.0),
|
||||
pointer + egui::vec2(17.0, 0.0),
|
||||
],
|
||||
egui::Stroke::new(1.5, ACCENT_HOVER),
|
||||
);
|
||||
painter.line_segment(
|
||||
[
|
||||
pointer - egui::vec2(0.0, 17.0),
|
||||
pointer - egui::vec2(0.0, 7.0),
|
||||
],
|
||||
egui::Stroke::new(1.5, ACCENT_HOVER),
|
||||
);
|
||||
painter.line_segment(
|
||||
[
|
||||
pointer + egui::vec2(0.0, 7.0),
|
||||
pointer + egui::vec2(0.0, 17.0),
|
||||
],
|
||||
egui::Stroke::new(1.5, ACCENT_HOVER),
|
||||
);
|
||||
}
|
||||
|
||||
let content = ui.ctx().content_rect();
|
||||
let pos = egui::pos2(
|
||||
(pointer.x + 20.0).min(content.right() - 258.0),
|
||||
(pointer.y + 20.0).min(content.bottom() - 64.0),
|
||||
);
|
||||
egui::Area::new(egui::Id::new("asset_drag_preview"))
|
||||
.fixed_pos(pos)
|
||||
.default_size(egui::vec2(246.0, 60.0))
|
||||
.order(egui::Order::Tooltip)
|
||||
.interactable(false)
|
||||
.show(ui.ctx(), |ui| {
|
||||
ui.set_min_size(egui::vec2(246.0, 60.0));
|
||||
ui.set_max_size(egui::vec2(246.0, 60.0));
|
||||
overlay_chip_frame().show(ui, |ui| {
|
||||
ui.set_width(228.0);
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(phosphor_icon(icon, 20.0).color(if over_viewport {
|
||||
ACCENT_HOVER
|
||||
} else {
|
||||
TEXT_DIM
|
||||
}));
|
||||
ui.vertical(|ui| {
|
||||
ui.spacing_mut().item_spacing.y = 1.0;
|
||||
ui.label(egui::RichText::new(label).strong().color(TEXT));
|
||||
ui.label(
|
||||
egui::RichText::new(if over_viewport {
|
||||
action
|
||||
} else {
|
||||
"Drag into the viewport"
|
||||
})
|
||||
.size(11.0)
|
||||
.color(if over_viewport {
|
||||
ACCENT_HOVER
|
||||
} else {
|
||||
TEXT_MUTED
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
if over_viewport {
|
||||
let corner = 16.0;
|
||||
let inset = viewport_rect.shrink(8.0);
|
||||
for (a, b, c) in [
|
||||
(
|
||||
inset.left_top(),
|
||||
egui::vec2(corner, 0.0),
|
||||
egui::vec2(0.0, corner),
|
||||
),
|
||||
(
|
||||
inset.right_top(),
|
||||
egui::vec2(-corner, 0.0),
|
||||
egui::vec2(0.0, corner),
|
||||
),
|
||||
(
|
||||
inset.left_bottom(),
|
||||
egui::vec2(corner, 0.0),
|
||||
egui::vec2(0.0, -corner),
|
||||
),
|
||||
(
|
||||
inset.right_bottom(),
|
||||
egui::vec2(-corner, 0.0),
|
||||
egui::vec2(0.0, -corner),
|
||||
),
|
||||
] {
|
||||
ui.painter()
|
||||
.line_segment([a, a + b], egui::Stroke::new(3.0, ACCENT_HOVER));
|
||||
ui.painter()
|
||||
.line_segment([a, a + c], egui::Stroke::new(3.0, ACCENT_HOVER));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user