From 96e15921aed1a9238674fa9697126cc0a17553f5 Mon Sep 17 00:00:00 2001 From: rewin Date: Fri, 15 Mar 2024 21:45:14 +0300 Subject: [PATCH] fmt --- studio/src/anim/mod.rs | 5 ++++- studio/src/debug.rs | 3 ++- studio/src/headless.rs | 14 ++++++++++---- studio/src/hierarchy.rs | 3 ++- studio/src/input.rs | 19 ++++++++++++++++--- studio/src/interaction/gizmos/camera.rs | 10 ++-------- studio/src/interaction/gizmos/mod.rs | 3 +-- studio/src/interaction/gizmos/rotation.rs | 4 +++- studio/src/math/geo.rs | 5 ++++- studio/src/remote/reader.rs | 5 ++++- studio/src/scene.rs | 5 +++-- studio/src/screenshot.rs | 13 +++++-------- studio/src/skybox.rs | 4 ++-- studio/src/ui/fps.rs | 6 ++++-- studio/src/ui/inspector.rs | 6 +++++- 15 files changed, 67 insertions(+), 38 deletions(-) diff --git a/studio/src/anim/mod.rs b/studio/src/anim/mod.rs index 2957988..25b8d21 100644 --- a/studio/src/anim/mod.rs +++ b/studio/src/anim/mod.rs @@ -1,5 +1,8 @@ use bevy::{ - ecs::entity::{EntityHashMap, EntityHashSet}, math::Affine3A, prelude::*, render::{mesh::skinning::SkinnedMesh, view::NoFrustumCulling} + ecs::entity::{EntityHashMap, EntityHashSet}, + math::Affine3A, + prelude::*, + render::{mesh::skinning::SkinnedMesh, view::NoFrustumCulling}, }; use space_editor::space_prefab::editor_registry::EditorRegistryExt; diff --git a/studio/src/debug.rs b/studio/src/debug.rs index 9223d6d..ef9a983 100644 --- a/studio/src/debug.rs +++ b/studio/src/debug.rs @@ -4,7 +4,8 @@ use bevy::{prelude::*, window::PrimaryWindow}; use bevy_inspector_egui::{bevy_egui::EguiPlugin, DefaultInspectorConfigPlugin}; use bevy_mod_picking::debug::DebugPickingMode; use space_editor::{ - prelude::*, space_editor_ui::{tools::gizmo::GizmoToolPlugin, EditorGizmoConfigPlugin, EditorPluginGroup} + prelude::*, + space_editor_ui::{tools::gizmo::GizmoToolPlugin, EditorGizmoConfigPlugin, EditorPluginGroup}, }; use crate::{ diff --git a/studio/src/headless.rs b/studio/src/headless.rs index 63659f0..27fb117 100644 --- a/studio/src/headless.rs +++ b/studio/src/headless.rs @@ -1,7 +1,9 @@ use std::time::Duration; use bevy::{ - app::{AppExit, ScheduleRunnerPlugin}, core_pipeline::Skybox, prelude::* + app::{AppExit, ScheduleRunnerPlugin}, + core_pipeline::Skybox, + prelude::*, }; use space_editor::prelude::{EditorEvent, EditorPrefabPath}; use wgpu::Extent3d; @@ -72,9 +74,13 @@ pub fn start_headless( HeadlessMode::Scene(scene, skybox) => { app.add_systems( Startup, - move |mut cmd: Commands, mut ew: EventWriter, mut asset_server: Res| { - - cmd.insert_resource(SkyboxHolder(Some(Skybox { image: asset_server.load(skybox.clone()), brightness: 1.0 }))); + move |mut cmd: Commands, + mut ew: EventWriter, + mut asset_server: Res| { + cmd.insert_resource(SkyboxHolder(Some(Skybox { + image: asset_server.load(skybox.clone()), + brightness: 1.0, + }))); ew.send(EditorEvent::Load(EditorPrefabPath::File(scene.clone()))); }, diff --git a/studio/src/hierarchy.rs b/studio/src/hierarchy.rs index 45bd1ac..a09ef84 100644 --- a/studio/src/hierarchy.rs +++ b/studio/src/hierarchy.rs @@ -1,5 +1,6 @@ use bevy::{ - ecs::entity::{EntityHashMap, EntityHashSet}, prelude::* + ecs::entity::{EntityHashMap, EntityHashSet}, + prelude::*, }; /// Find the parent entity of `target`. Returns `None` if `target` has no diff --git a/studio/src/input.rs b/studio/src/input.rs index 4ba2f40..372347f 100644 --- a/studio/src/input.rs +++ b/studio/src/input.rs @@ -90,7 +90,10 @@ impl From for Action { // TODO: Make the bindings of raw device inputs to InputActions configurable -fn translate_selection_events(keyboard: Res>, mut input: EventWriter) { +fn translate_selection_events( + keyboard: Res>, + mut input: EventWriter, +) { if keyboard.just_pressed(KeyCode::Escape) { input.send(InputAction(Lifecycle::Start, Selection::Clear.into())); } else if keyboard.just_released(KeyCode::Escape) { @@ -110,7 +113,10 @@ fn translate_selection_events(keyboard: Res>, mut input: Ev } } -fn translate_debug_toggle(keyboard: Res>, mut input: EventWriter) { +fn translate_debug_toggle( + keyboard: Res>, + mut input: EventWriter, +) { if keyboard.pressed(KeyCode::ControlLeft) || keyboard.pressed(KeyCode::ControlRight) { if keyboard.just_pressed(KeyCode::Backquote) { input.send(InputAction(Lifecycle::Start, Action::ToggleDebug)); @@ -232,7 +238,14 @@ fn translate_fps_camera_events( ) { // Camera Translation (FPS-like) use KeyCode::*; - let wasd_keys = [KeyCode::KeyW, KeyCode::KeyA, KeyCode::KeyS, KeyCode::KeyD, KeyCode::KeyE, KeyCode::KeyQ]; + let wasd_keys = [ + KeyCode::KeyW, + KeyCode::KeyA, + KeyCode::KeyS, + KeyCode::KeyD, + KeyCode::KeyE, + KeyCode::KeyQ, + ]; let wasd_keys_set = wasd_keys.into_iter().collect::>(); // A little unfortunate that `get_pressed()` doesn't just return a reference diff --git a/studio/src/interaction/gizmos/camera.rs b/studio/src/interaction/gizmos/camera.rs index 2683141..d81c85a 100644 --- a/studio/src/interaction/gizmos/camera.rs +++ b/studio/src/interaction/gizmos/camera.rs @@ -1,8 +1,4 @@ -use bevy::{ - core_pipeline::fxaa::Fxaa, - prelude::*, - render::view::RenderLayers, -}; +use bevy::{core_pipeline::fxaa::Fxaa, prelude::*, render::view::RenderLayers}; use space_editor::space_editor_ui::camera_plugin::NotShowCamera; use crate::MainCamera; @@ -23,9 +19,7 @@ pub(super) fn spawn_gizmo_camera( Name::new("Gizmo Camera"), GizmoCamera, Camera3dBundle { - camera_3d: Camera3d { - ..default() - }, + camera_3d: Camera3d { ..default() }, camera: Camera { hdr: true, order: 1, diff --git a/studio/src/interaction/gizmos/mod.rs b/studio/src/interaction/gizmos/mod.rs index 0ee538c..4ee58de 100644 --- a/studio/src/interaction/gizmos/mod.rs +++ b/studio/src/interaction/gizmos/mod.rs @@ -46,8 +46,7 @@ impl Plugin for GizmoPlugin { app.add_systems( PreUpdate, spawn_gizmo_camera.run_if( - any_with_component:: - .and_then(not(any_with_component::)), + any_with_component::.and_then(not(any_with_component::)), ), ); app.add_systems( diff --git a/studio/src/interaction/gizmos/rotation.rs b/studio/src/interaction/gizmos/rotation.rs index 4363984..a095617 100644 --- a/studio/src/interaction/gizmos/rotation.rs +++ b/studio/src/interaction/gizmos/rotation.rs @@ -302,7 +302,9 @@ pub(super) fn on_rotate( } let view_plane_normal = (cam_xform.translation() - p1).normalize(); - let hit_dist = ray.intersect_plane(p1, Plane3d::new(view_plane_normal)).unwrap(); + let hit_dist = ray + .intersect_plane(p1, Plane3d::new(view_plane_normal)) + .unwrap(); let p2 = ray.origin + ray.direction * hit_dist; let drag_dist = (p2 - p1).length(); // TODO: Sensitivity could use some tuning diff --git a/studio/src/math/geo.rs b/studio/src/math/geo.rs index 492cd65..e398906 100644 --- a/studio/src/math/geo.rs +++ b/studio/src/math/geo.rs @@ -1,7 +1,10 @@ use bevy::{ math::vec3, prelude::*, - render::{mesh::Indices, primitives::Aabb, render_asset::RenderAssetUsages, render_resource::PrimitiveTopology}, + render::{ + mesh::Indices, primitives::Aabb, render_asset::RenderAssetUsages, + render_resource::PrimitiveTopology, + }, }; pub struct Cone { diff --git a/studio/src/remote/reader.rs b/studio/src/remote/reader.rs index aca12c3..41531cb 100644 --- a/studio/src/remote/reader.rs +++ b/studio/src/remote/reader.rs @@ -113,6 +113,9 @@ trait IntoError { impl IntoError for reqwest::Error { fn into(self) -> AssetReaderError { - AssetReaderError::Io(Arc::new(std::io::Error::new(ErrorKind::Other, format!("{self}")))) + AssetReaderError::Io(Arc::new(std::io::Error::new( + ErrorKind::Other, + format!("{self}"), + ))) } } diff --git a/studio/src/scene.rs b/studio/src/scene.rs index c6140e9..8fcaad5 100644 --- a/studio/src/scene.rs +++ b/studio/src/scene.rs @@ -3,7 +3,8 @@ use bevy::{ core_pipeline::{ bloom::{BloomCompositeMode, BloomPrefilterSettings, BloomSettings}, fxaa::Fxaa, - tonemapping::Tonemapping, Skybox, + tonemapping::Tonemapping, + Skybox, }, gltf::Gltf, math::vec2, @@ -111,7 +112,7 @@ pub struct SkyboxHolder(pub Option); fn attach_skybox( mut cmd: Commands, mut skybox_holder: ResMut, - mut q_camera: Query, Without)> + mut q_camera: Query, Without)>, ) { let Some(skybox) = skybox_holder.0.as_ref() else { return; diff --git a/studio/src/screenshot.rs b/studio/src/screenshot.rs index 3b730e4..8a7e70b 100644 --- a/studio/src/screenshot.rs +++ b/studio/src/screenshot.rs @@ -1,9 +1,10 @@ +use bevy::render::render_graph::RenderSubGraph; use bevy::{ app::AppExit, core_pipeline::{core_3d, prepass::ViewPrepassTextures}, prelude::*, render::{ - render_graph::{RenderGraphApp, ViewNode, ViewNodeRunner}, + render_graph::{RenderGraphApp, RenderLabel, ViewNode, ViewNodeRunner}, render_resource::{ Buffer, BufferDescriptor, BufferUsages, ImageCopyBuffer, ImageDataLayout, MapMode, }, @@ -52,13 +53,13 @@ impl Plugin for ScreenShotPlugin { //Render Graph Additions .add_render_graph_node::>( core_3d::graph::Core3d, - ScreenCaptureNode::NAME, + ScreenCaptureNode, ) .add_render_graph_edges( core_3d::graph::Core3d, &[ core_3d::graph::Node3d::Tonemapping, - ScreenCaptureNode::NAME, + ScreenCaptureNode, core_3d::graph::Node3d::EndMainPassPostProcessing, ], ); @@ -206,13 +207,9 @@ fn prepare_screen_capture_buffers( // Screen Shot View Node //============================================================================== -#[derive(Default)] +#[derive(Debug, Hash, PartialEq, Eq, Clone, RenderLabel, Default)] struct ScreenCaptureNode; -impl ScreenCaptureNode { - pub const NAME: &'static str = "ScreenCaptureNode"; -} - impl ViewNode for ScreenCaptureNode { type ViewQuery = ( Entity, diff --git a/studio/src/skybox.rs b/studio/src/skybox.rs index d98213e..12b8644 100644 --- a/studio/src/skybox.rs +++ b/studio/src/skybox.rs @@ -99,8 +99,8 @@ fn spawn_skybox( // Add components to the scene camera cmd.entity(q_camera.single()).insert(( Skybox { - image : skybox_assets.cubemap.clone(), - brightness: 1.0 + image: skybox_assets.cubemap.clone(), + brightness: 1.0, }, EnvironmentMapLight { diffuse_map: skybox_assets.env_diffuse.clone(), diff --git a/studio/src/ui/fps.rs b/studio/src/ui/fps.rs index 76e2ff1..afd98de 100644 --- a/studio/src/ui/fps.rs +++ b/studio/src/ui/fps.rs @@ -1,5 +1,7 @@ use bevy::{ - a11y::accesskit::TextAlign, diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin}, prelude::* + a11y::accesskit::TextAlign, + diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin}, + prelude::*, }; use crate::debug::DebugMode; @@ -35,7 +37,7 @@ fn layout(mut cmd: Commands) { position_type: PositionType::Absolute, right: Val::Px(16.), bottom: Val::Px(16.), - + ..default() }); diff --git a/studio/src/ui/inspector.rs b/studio/src/ui/inspector.rs index be29778..1a18691 100644 --- a/studio/src/ui/inspector.rs +++ b/studio/src/ui/inspector.rs @@ -10,7 +10,11 @@ use bevy::{ use serde::{Deserialize, Serialize}; use serde_json::*; use space_editor::{ - space_editor_ui::{editor_tab::{EditorTab, EditorTabName}, ui_plugin::EditorUiAppExt}, space_prefab::component::MeshPrimitive3dPrefab, + space_editor_ui::{ + editor_tab::{EditorTab, EditorTabName}, + ui_plugin::EditorUiAppExt, + }, + space_prefab::component::MeshPrimitive3dPrefab, }; use wasm_bindgen::prelude::*;