This commit is contained in:
1 parent
f29712d158
commit
3e053a81ab
123 files changed
+31930
-1404
No files matched your search
@@ -4,12 +4,14 @@ use bevy::prelude::*;
|
||||
use bevy_egui::{egui, EguiTextureHandle, EguiUserTextures};
|
||||
use bevy_inspector_egui::bevy_inspector::hierarchy::SelectedEntities;
|
||||
use egui_phosphor_icons::icons;
|
||||
use transform_gizmo_bevy::prelude::GizmoOptions;
|
||||
|
||||
use crate::assets::EditorAssets;
|
||||
use crate::assets::{AssetSelection, AssetSubAssetKind, EditorAssets};
|
||||
use crate::gizmos::{EditorGizmoMode, EditorGizmoSpace};
|
||||
use crate::render_target::ViewportRenderTarget;
|
||||
use crate::selection::ViewportClick;
|
||||
use crate::state::PlayPossession;
|
||||
use crate::viewport::actor_icons::ActorIconSettings;
|
||||
use crate::viewport::{
|
||||
snap_translation, viewport_ground_position, EditorViewportMode, ViewportDisplayMode,
|
||||
ViewportSettings,
|
||||
@@ -378,6 +380,13 @@ fn scene_options_popover(
|
||||
.text("Snap step"),
|
||||
);
|
||||
}
|
||||
if let Some(mut gizmo_options) = world.get_resource_mut::<GizmoOptions>() {
|
||||
ui.separator();
|
||||
ui.add(
|
||||
egui::Slider::new(&mut gizmo_options.visuals.gizmo_size, 40.0..=160.0)
|
||||
.text("Gizmo size"),
|
||||
);
|
||||
}
|
||||
if let Some(mut mode) = world.get_resource_mut::<EditorViewportMode>() {
|
||||
ui.separator();
|
||||
ui.label("Shading");
|
||||
@@ -387,6 +396,7 @@ fn scene_options_popover(
|
||||
ui.selectable_value(&mut *mode, EditorViewportMode::Collider, "Colliders");
|
||||
});
|
||||
}
|
||||
let mut actor_icons_active = false;
|
||||
if let Some(mut visualizers) =
|
||||
world.get_resource_mut::<crate::visualizers::EditorVisualizationSettings>()
|
||||
{
|
||||
@@ -409,6 +419,7 @@ fn scene_options_popover(
|
||||
ui.checkbox(&mut visualizers.show_actor_icon_debug, "Warnings");
|
||||
});
|
||||
});
|
||||
actor_icons_active = visualizers.enabled && visualizers.show_actor_icons;
|
||||
ui.separator();
|
||||
ui.checkbox(&mut visualizers.show_colliders, "Colliders");
|
||||
ui.checkbox(&mut visualizers.show_lights, "Lights");
|
||||
@@ -421,6 +432,18 @@ fn scene_options_popover(
|
||||
ui.checkbox(&mut visualizers.pickable_proxies, "Selectable proxies");
|
||||
});
|
||||
}
|
||||
if actor_icons_active {
|
||||
if let Some(mut icon_settings) = world.get_resource_mut::<ActorIconSettings>() {
|
||||
ui.add(
|
||||
egui::Slider::new(
|
||||
&mut icon_settings.size_pixels,
|
||||
ActorIconSettings::MIN_SIZE_PIXELS
|
||||
..=ActorIconSettings::MAX_SIZE_PIXELS,
|
||||
)
|
||||
.text("Icon size"),
|
||||
);
|
||||
}
|
||||
}
|
||||
ui.horizontal(|ui| {
|
||||
if ui.button("Save bookmark").clicked() {
|
||||
viewport_save_bookmark(world);
|
||||
@@ -502,12 +525,53 @@ fn viewport_asset_drop_ui(
|
||||
return;
|
||||
}
|
||||
|
||||
let asset = {
|
||||
let selection = {
|
||||
let assets = world.resource::<EditorAssets>();
|
||||
assets.dragging_asset().cloned()
|
||||
assets.dragging_selection().cloned()
|
||||
};
|
||||
world.resource_mut::<EditorAssets>().clear_drag();
|
||||
|
||||
let Some(selection) = 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::Mesh,
|
||||
..
|
||||
}
|
||||
) {
|
||||
crate::assets::spawn_subasset_at(world, &selection, placement);
|
||||
return;
|
||||
}
|
||||
|
||||
if let AssetSelection::SubAsset {
|
||||
kind: AssetSubAssetKind::Texture,
|
||||
source_path: Some(path),
|
||||
label,
|
||||
..
|
||||
} = &selection
|
||||
{
|
||||
let asset = crate::assets::EditorAsset {
|
||||
label: label.clone(),
|
||||
path: Some(path.clone()),
|
||||
folder_path: std::path::Path::new(path)
|
||||
.parent()
|
||||
.map(|parent| parent.to_string_lossy().replace('\\', "/"))
|
||||
.unwrap_or_else(|| crate::assets::ASSETS_ROOT.to_string()),
|
||||
kind: crate::assets::EditorAssetKind::Texture,
|
||||
};
|
||||
crate::ui::helpers::apply_texture_to_selection(world, &asset, selected);
|
||||
return;
|
||||
}
|
||||
|
||||
let asset = {
|
||||
let assets = world.resource::<EditorAssets>();
|
||||
assets.asset_for_selection(&selection).cloned()
|
||||
};
|
||||
let Some(asset) = asset else {
|
||||
return;
|
||||
};
|
||||
@@ -523,8 +587,5 @@ fn viewport_asset_drop_ui(
|
||||
_ => {}
|
||||
}
|
||||
|
||||
let placement = viewport_ground_position(world, pointer_pos.unwrap(), viewport_rect)
|
||||
.map(|pos| snap_translation(pos, world.resource::<ViewportSettings>()))
|
||||
.unwrap_or(Vec3::ZERO);
|
||||
crate::assets::spawn_asset_at(world, &asset, placement);
|
||||
}
|
||||
Reference in new issue
Block a user