From cd5028f93f1b1ecff0668e199352c0028eff02fc Mon Sep 17 00:00:00 2001 From: rewin Date: Fri, 29 Mar 2024 20:31:41 +0300 Subject: [PATCH] fmt --- studio/src/bvh/mod.rs | 2 -- studio/src/debug.rs | 2 +- studio/src/input.rs | 19 +++++++++++++++---- studio/src/interaction/gizmos/resources.rs | 3 +-- studio/src/lib.rs | 5 +---- studio/src/scene/mod.rs | 17 +++++++---------- studio/src/screenshot.rs | 1 - studio/src/skybox.rs | 5 +---- studio/src/ui/inspector.rs | 7 +++++-- studio/src/viewport.rs | 16 +++++++++++----- 10 files changed, 42 insertions(+), 35 deletions(-) diff --git a/studio/src/bvh/mod.rs b/studio/src/bvh/mod.rs index 25bb5c6..48470fb 100644 --- a/studio/src/bvh/mod.rs +++ b/studio/src/bvh/mod.rs @@ -1,5 +1,3 @@ - - use bevy::{ app::{App, Plugin, PostUpdate, Update}, asset::{Asset, AssetApp, AssetEvent, Assets, Handle}, diff --git a/studio/src/debug.rs b/studio/src/debug.rs index ec484f7..8da3936 100644 --- a/studio/src/debug.rs +++ b/studio/src/debug.rs @@ -1,7 +1,7 @@ use std::fmt; use bevy::{prelude::*, window::PrimaryWindow}; -use bevy_inspector_egui::{DefaultInspectorConfigPlugin}; +use bevy_inspector_egui::DefaultInspectorConfigPlugin; use bevy_mod_picking::debug::DebugPickingMode; use space_editor::{ prelude::*, diff --git a/studio/src/input.rs b/studio/src/input.rs index 7cd6645..9c4deba 100644 --- a/studio/src/input.rs +++ b/studio/src/input.rs @@ -78,9 +78,20 @@ fn log_input_actions( let mod_keys = [AltLeft, AltRight, ShiftLeft, ControlLeft, ControlRight] .into_iter() .collect::>(); - let action_keys = [KeyCode::KeyW, KeyCode::KeyA, KeyCode::KeyS, KeyCode::KeyD, KeyCode::KeyE, KeyCode::KeyQ, KeyCode::Escape, KeyCode::Quote, KeyCode::Delete, KeyCode::KeyF] - .into_iter() - .collect::>(); + let action_keys = [ + KeyCode::KeyW, + KeyCode::KeyA, + KeyCode::KeyS, + KeyCode::KeyD, + KeyCode::KeyE, + KeyCode::KeyQ, + KeyCode::Escape, + KeyCode::Quote, + KeyCode::Delete, + KeyCode::KeyF, + ] + .into_iter() + .collect::>(); let keys_pressed = ri_keyboard.get_pressed().copied().collect::>(); let keys_display = keys_pressed @@ -298,7 +309,7 @@ fn translate_fps_camera_events( mut input: EventWriter, ) { // Camera Translation (FPS-like) - + let wasd_keys = [ KeyCode::KeyW, KeyCode::KeyA, diff --git a/studio/src/interaction/gizmos/resources.rs b/studio/src/interaction/gizmos/resources.rs index e58e32c..c23911f 100644 --- a/studio/src/interaction/gizmos/resources.rs +++ b/studio/src/interaction/gizmos/resources.rs @@ -44,12 +44,11 @@ pub(super) fn init_resources( mut ra_meshes: ResMut>, mut ra_mats: ResMut>, ) { - let translate_line = ra_meshes.add(Cylinder { radius: 0.03, half_height: 0.4, }); - + let translate_arrow = ra_meshes.add(Mesh::from(geo::Cone { radius: 0.115, length: 0.4, diff --git a/studio/src/lib.rs b/studio/src/lib.rs index 6c29753..16408bd 100644 --- a/studio/src/lib.rs +++ b/studio/src/lib.rs @@ -1,9 +1,6 @@ #![allow(clippy::type_complexity, clippy::too_many_arguments)] -use bevy::{ - app::PluginGroupBuilder, - prelude::*, -}; +use bevy::{app::PluginGroupBuilder, prelude::*}; use bevy_mod_picking::DefaultPickingPlugins; use bevy_web_asset::WebAssetPlugin; use scene::ImportSceneEvent; diff --git a/studio/src/scene/mod.rs b/studio/src/scene/mod.rs index 5ed9faf..3c2edad 100644 --- a/studio/src/scene/mod.rs +++ b/studio/src/scene/mod.rs @@ -104,10 +104,7 @@ impl Plugin for ScenePlugin { ), ); - app.add_systems( - PreUpdate, - check_loading - ); + app.add_systems(PreUpdate, check_loading); //setup default light app.add_systems(Startup, minimal_scene_setup); @@ -185,20 +182,22 @@ pub struct LoadingQueue { } fn check_loading( - mut frames_without_loading : Local, + mut frames_without_loading: Local, mut loading_queue: ResMut, mut st_next: ResMut>, r_scene_state: Res>, asset_server: Res, ) { - info!("Checking loading: {}", *frames_without_loading); // Avoid transitioning from `SceneState::None` directly to `SceneState::Active`. // We will always be initializing the scene with _something_, so if the // `LoadingQueue` is empty when we're in `SceneState::None`, it just means // our startup routine hasn't yet gotten to the point of processing any // `Handle`s. - if loading_queue.queue.is_empty() && **r_scene_state == SceneState::Loading && *frames_without_loading > 100 { + if loading_queue.queue.is_empty() + && **r_scene_state == SceneState::Loading + && *frames_without_loading > 100 + { st_next.set(SceneState::Active); return; } @@ -216,9 +215,7 @@ fn check_loading( info!("Loading {} assets", loading_queue.queue.len()); loading_queue.queue.retain(|h| { - if let Some((load_state, dep_load_state, _)) = - asset_server.get_load_states(h.id()) - { + if let Some((load_state, dep_load_state, _)) = asset_server.get_load_states(h.id()) { if load_state == LoadState::NotLoaded { not_loaded_count += 1; } diff --git a/studio/src/screenshot.rs b/studio/src/screenshot.rs index 93b6544..4c2edb0 100644 --- a/studio/src/screenshot.rs +++ b/studio/src/screenshot.rs @@ -1,4 +1,3 @@ - use bevy::{ app::AppExit, core_pipeline::{core_3d, prepass::ViewPrepassTextures}, diff --git a/studio/src/skybox.rs b/studio/src/skybox.rs index 104ab93..d15a074 100644 --- a/studio/src/skybox.rs +++ b/studio/src/skybox.rs @@ -1,7 +1,4 @@ -use bevy::{ - asset::LoadState, - prelude::*, -}; +use bevy::{asset::LoadState, prelude::*}; use crate::MainCamera; diff --git a/studio/src/ui/inspector.rs b/studio/src/ui/inspector.rs index 265721e..b11d3e5 100644 --- a/studio/src/ui/inspector.rs +++ b/studio/src/ui/inspector.rs @@ -11,9 +11,12 @@ use serde::{Deserialize, Serialize}; use serde_json::{self, json, Map as JsonMap, Value as JsonValue}; use space_editor::{ space_editor_ui::{ - editor_tab::{EditorTab, EditorTabName}, ui_plugin::EditorUiAppExt + editor_tab::{EditorTab, EditorTabName}, + ui_plugin::EditorUiAppExt, + }, + space_prefab::{ + component::MeshPrimitive3dPrefab, editor_registry::EditorRegistryExt, save::SaveState, }, - space_prefab::{component::MeshPrimitive3dPrefab, editor_registry::EditorRegistryExt, save::SaveState}, }; use wasm_bindgen::prelude::*; diff --git a/studio/src/viewport.rs b/studio/src/viewport.rs index 4ead5a1..735928a 100644 --- a/studio/src/viewport.rs +++ b/studio/src/viewport.rs @@ -51,7 +51,10 @@ pub mod wasm { use bevy::{prelude::*, render::camera::Viewport}; use wasm_bindgen::prelude::*; - use crate::{wasm::{StaticBuffer, WasmMessageBuffer}, MainCamera}; + use crate::{ + wasm::{StaticBuffer, WasmMessageBuffer}, + MainCamera, + }; use super::ViewportSize; @@ -66,9 +69,9 @@ pub mod wasm { impl Plugin for ViewportPlugin { fn build(&self, app: &mut App) { - app.add_event::() - .add_systems(PreUpdate, - (dispatch_resize_events, sync_window_to_viewport).chain() + app.add_event::().add_systems( + PreUpdate, + (dispatch_resize_events, sync_window_to_viewport).chain(), ); } } @@ -95,7 +98,10 @@ pub mod wasm { fn dispatch_resize_events(mut events: EventWriter) { if let Some(resize) = RESIZE_BUF.take_message() { events.send(ViewportResizeEvent(resize)); - info!("Dispatch Viewport size: ({:.2}, {:.2})", resize.width, resize.height); + info!( + "Dispatch Viewport size: ({:.2}, {:.2})", + resize.width, resize.height + ); } } }