From 4b0969d9cf478e0b66dffe5d528761369af3bed9 Mon Sep 17 00:00:00 2001 From: Nova Date: Mon, 30 Jun 2025 01:56:42 -0700 Subject: [PATCH] cleanup: cargo fmt --- src/core/bevy_channel.rs | 1 - src/core/mod.rs | 6 +++--- src/nodes/drawable/lines.rs | 6 ++++-- src/nodes/drawable/model.rs | 9 ++++++--- src/wayland/surface.rs | 6 +++++- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/core/bevy_channel.rs b/src/core/bevy_channel.rs index 0e86d8e..21146fd 100644 --- a/src/core/bevy_channel.rs +++ b/src/core/bevy_channel.rs @@ -29,4 +29,3 @@ impl BevyChannelReader { } } } - diff --git a/src/core/mod.rs b/src/core/mod.rs index ead1b89..92c18f7 100644 --- a/src/core/mod.rs +++ b/src/core/mod.rs @@ -1,12 +1,12 @@ +pub mod bevy_channel; pub mod client; pub mod client_state; +pub mod color; pub mod delta; pub mod destroy_queue; +pub mod entity_handle; pub mod error; pub mod registry; pub mod resource; pub mod scenegraph; pub mod task; -pub mod color; -pub mod entity_handle; -pub mod bevy_channel; diff --git a/src/nodes/drawable/lines.rs b/src/nodes/drawable/lines.rs index d70db93..f58d73d 100644 --- a/src/nodes/drawable/lines.rs +++ b/src/nodes/drawable/lines.rs @@ -1,12 +1,14 @@ use super::{Line, LinesAspect}; use crate::{ + BevyMaterial, core::{ client::Client, color::ColorConvert, entity_handle::EntityHandle, error::Result, registry::Registry, }, nodes::{ - spatial::{Spatial, SpatialNode}, Node - }, BevyMaterial, + Node, + spatial::{Spatial, SpatialNode}, + }, }; use bevy::{ asset::RenderAssetUsages, diff --git a/src/nodes/drawable/model.rs b/src/nodes/drawable/model.rs index 5cfc082..8d648ff 100644 --- a/src/nodes/drawable/model.rs +++ b/src/nodes/drawable/model.rs @@ -31,7 +31,11 @@ impl Plugin for ModelNodePlugin { app.add_systems(Update, load_models); app.add_systems( PostUpdate, - (gen_model_parts, apply_materials/* , update_visibillity */).chain(), + ( + gen_model_parts, + apply_materials, /* , update_visibillity */ + ) + .chain(), ); } } @@ -448,8 +452,7 @@ impl Material { .occlusion_texture .as_ref() .map(|p| asset_server.load(p.as_path())), - ..Default::default() - // spherical_harmonics: bevy_sk::skytext::SPHERICAL_HARMONICS_HANDLE, + ..Default::default() // spherical_harmonics: bevy_sk::skytext::SPHERICAL_HARMONICS_HANDLE, } } } diff --git a/src/wayland/surface.rs b/src/wayland/surface.rs index e4877ae..441379a 100644 --- a/src/wayland/surface.rs +++ b/src/wayland/surface.rs @@ -96,7 +96,11 @@ impl CoreSurface { // Import all surface buffers into textures if let Err(err) = import_surface_tree(renderer, &wl_surface) { - tracing::error!("Failed to import surface tree for surface {}: {}", wl_surface.id(), err); + tracing::error!( + "Failed to import surface tree for surface {}: {}", + wl_surface.id(), + err + ); return; }