cleanup: cargo fmt
This commit is contained in:
@@ -29,4 +29,3 @@ impl<T: Send + Sync + 'static> BevyChannelReader<T> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
|
pub mod bevy_channel;
|
||||||
pub mod client;
|
pub mod client;
|
||||||
pub mod client_state;
|
pub mod client_state;
|
||||||
|
pub mod color;
|
||||||
pub mod delta;
|
pub mod delta;
|
||||||
pub mod destroy_queue;
|
pub mod destroy_queue;
|
||||||
|
pub mod entity_handle;
|
||||||
pub mod error;
|
pub mod error;
|
||||||
pub mod registry;
|
pub mod registry;
|
||||||
pub mod resource;
|
pub mod resource;
|
||||||
pub mod scenegraph;
|
pub mod scenegraph;
|
||||||
pub mod task;
|
pub mod task;
|
||||||
pub mod color;
|
|
||||||
pub mod entity_handle;
|
|
||||||
pub mod bevy_channel;
|
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
use super::{Line, LinesAspect};
|
use super::{Line, LinesAspect};
|
||||||
use crate::{
|
use crate::{
|
||||||
|
BevyMaterial,
|
||||||
core::{
|
core::{
|
||||||
client::Client, color::ColorConvert, entity_handle::EntityHandle, error::Result,
|
client::Client, color::ColorConvert, entity_handle::EntityHandle, error::Result,
|
||||||
registry::Registry,
|
registry::Registry,
|
||||||
},
|
},
|
||||||
nodes::{
|
nodes::{
|
||||||
spatial::{Spatial, SpatialNode}, Node
|
Node,
|
||||||
}, BevyMaterial,
|
spatial::{Spatial, SpatialNode},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
use bevy::{
|
use bevy::{
|
||||||
asset::RenderAssetUsages,
|
asset::RenderAssetUsages,
|
||||||
|
|||||||
@@ -31,7 +31,11 @@ impl Plugin for ModelNodePlugin {
|
|||||||
app.add_systems(Update, load_models);
|
app.add_systems(Update, load_models);
|
||||||
app.add_systems(
|
app.add_systems(
|
||||||
PostUpdate,
|
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
|
.occlusion_texture
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(|p| asset_server.load(p.as_path())),
|
.map(|p| asset_server.load(p.as_path())),
|
||||||
..Default::default()
|
..Default::default() // spherical_harmonics: bevy_sk::skytext::SPHERICAL_HARMONICS_HANDLE,
|
||||||
// spherical_harmonics: bevy_sk::skytext::SPHERICAL_HARMONICS_HANDLE,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,7 +96,11 @@ impl CoreSurface {
|
|||||||
|
|
||||||
// Import all surface buffers into textures
|
// Import all surface buffers into textures
|
||||||
if let Err(err) = import_surface_tree(renderer, &wl_surface) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user