From e7d5464cb93b02c9115136a54bff8504be19abb3 Mon Sep 17 00:00:00 2001 From: rewin Date: Wed, 3 Apr 2024 22:25:08 +0300 Subject: [PATCH] fmt --- studio/src/camera_controller.rs | 2 +- studio/src/debug.rs | 6 ++---- studio/src/headless.rs | 26 ++++++++++++++++---------- studio/src/ui/inspector.rs | 3 +-- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/studio/src/camera_controller.rs b/studio/src/camera_controller.rs index be124c7..5985506 100644 --- a/studio/src/camera_controller.rs +++ b/studio/src/camera_controller.rs @@ -5,6 +5,7 @@ use bevy::{ window::{CursorGrabMode, PrimaryWindow}, }; +use crate::MainCamera; use crate::{ input::{self, Action, CameraMotion, InputAction, Lifecycle}, interaction::Selection, @@ -14,7 +15,6 @@ use crate::{ }, }; use bevy::render::camera::Viewport; -use crate::MainCamera; pub struct CameraControllerPlugin; diff --git a/studio/src/debug.rs b/studio/src/debug.rs index 5d8aa56..6076ea0 100644 --- a/studio/src/debug.rs +++ b/studio/src/debug.rs @@ -83,9 +83,7 @@ impl Plugin for DebugPlugin { } if only_core { - app - .add_plugins(PrefabPlugin) - .add_plugins(EditorCore); + app.add_plugins(PrefabPlugin).add_plugins(EditorCore); } else { app.add_plugins(editor_ui_group); app.auto_undo::>(); @@ -93,7 +91,7 @@ impl Plugin for DebugPlugin { app.auto_undo::>(); app.auto_undo::(); app.auto_undo::(); - + app.add_systems(Update, sync_editor_camera); app.add_systems( Update, diff --git a/studio/src/headless.rs b/studio/src/headless.rs index 24144d4..4de8750 100644 --- a/studio/src/headless.rs +++ b/studio/src/headless.rs @@ -1,7 +1,10 @@ use std::time::Duration; use bevy::{ - app::{AppExit, ScheduleRunnerPlugin}, asset::AssetMetaCheck, core_pipeline::Skybox, prelude::* + app::{AppExit, ScheduleRunnerPlugin}, + asset::AssetMetaCheck, + core_pipeline::Skybox, + prelude::*, }; use bevy_web_asset::WebAssetPlugin; use space_editor::prelude::{EditorEvent, EditorPrefabPath}; @@ -57,16 +60,19 @@ pub fn start_headless( ScheduleRunnerPlugin::run_loop(Duration::from_secs_f64(1.0 / fps as f64)), WebAssetPlugin, RemoteAssetPlugin, - DefaultPlugins.set(WindowPlugin { - primary_window: None, - exit_condition: bevy::window::ExitCondition::DontExit, - close_when_requested: true, - }).set(AssetPlugin { - mode: AssetMode::Unprocessed, - ..default() - }), + DefaultPlugins + .set(WindowPlugin { + primary_window: None, + exit_condition: bevy::window::ExitCondition::DontExit, + close_when_requested: true, + }) + .set(AssetPlugin { + mode: AssetMode::Unprocessed, + ..default() + }), ScreenShotPlugin, - CommonPlugins.build() + CommonPlugins + .build() .disable::() .disable::(), )); diff --git a/studio/src/ui/inspector.rs b/studio/src/ui/inspector.rs index ac0ef28..9c8df39 100644 --- a/studio/src/ui/inspector.rs +++ b/studio/src/ui/inspector.rs @@ -20,17 +20,16 @@ use space_editor::{ }; use wasm_bindgen::prelude::*; -use crate::{material::short_material::ShortMaterial, StudioMode}; use crate::{ interaction::Selection, wasm::{self, StaticBuffer, WasmMessageBuffer}, }; +use crate::{material::short_material::ShortMaterial, StudioMode}; pub struct InspectorPlugin; impl Plugin for InspectorPlugin { fn build(&self, app: &mut App) { - #[cfg(not(feature = "wasm"))] return;