diff --git a/crates/bevy_asset/src/io/file/sync_file_asset.rs b/crates/bevy_asset/src/io/file/sync_file_asset.rs index 302b7cd839..2ac547e9b7 100644 --- a/crates/bevy_asset/src/io/file/sync_file_asset.rs +++ b/crates/bevy_asset/src/io/file/sync_file_asset.rs @@ -160,10 +160,7 @@ impl AssetReader for FileAssetReader { } } - async fn is_directory<'a>( - &'a self, - path: &'a Path, - ) -> std::result::Result { + async fn is_directory<'a>(&'a self, path: &'a Path) -> Result { let full_path = self.root_path.join(path); let metadata = full_path .metadata() @@ -194,35 +191,26 @@ impl AssetWriter for FileAssetWriter { Ok(writer) } - async fn remove<'a>(&'a self, path: &'a Path) -> std::result::Result<(), AssetWriterError> { + async fn remove<'a>(&'a self, path: &'a Path) -> Result<(), AssetWriterError> { let full_path = self.root_path.join(path); std::fs::remove_file(full_path)?; Ok(()) } - async fn remove_meta<'a>( - &'a self, - path: &'a Path, - ) -> std::result::Result<(), AssetWriterError> { + async fn remove_meta<'a>(&'a self, path: &'a Path) -> Result<(), AssetWriterError> { let meta_path = get_meta_path(path); let full_path = self.root_path.join(meta_path); std::fs::remove_file(full_path)?; Ok(()) } - async fn remove_directory<'a>( - &'a self, - path: &'a Path, - ) -> std::result::Result<(), AssetWriterError> { + async fn remove_directory<'a>(&'a self, path: &'a Path) -> Result<(), AssetWriterError> { let full_path = self.root_path.join(path); std::fs::remove_dir_all(full_path)?; Ok(()) } - async fn remove_empty_directory<'a>( - &'a self, - path: &'a Path, - ) -> std::result::Result<(), AssetWriterError> { + async fn remove_empty_directory<'a>(&'a self, path: &'a Path) -> Result<(), AssetWriterError> { let full_path = self.root_path.join(path); std::fs::remove_dir(full_path)?; Ok(()) @@ -231,7 +219,7 @@ impl AssetWriter for FileAssetWriter { async fn remove_assets_in_directory<'a>( &'a self, path: &'a Path, - ) -> std::result::Result<(), AssetWriterError> { + ) -> Result<(), AssetWriterError> { let full_path = self.root_path.join(path); std::fs::remove_dir_all(&full_path)?; std::fs::create_dir_all(&full_path)?; @@ -242,7 +230,7 @@ impl AssetWriter for FileAssetWriter { &'a self, old_path: &'a Path, new_path: &'a Path, - ) -> std::result::Result<(), AssetWriterError> { + ) -> Result<(), AssetWriterError> { let full_old_path = self.root_path.join(old_path); let full_new_path = self.root_path.join(new_path); if let Some(parent) = full_new_path.parent() { @@ -256,7 +244,7 @@ impl AssetWriter for FileAssetWriter { &'a self, old_path: &'a Path, new_path: &'a Path, - ) -> std::result::Result<(), AssetWriterError> { + ) -> Result<(), AssetWriterError> { let old_meta_path = get_meta_path(old_path); let new_meta_path = get_meta_path(new_path); let full_old_path = self.root_path.join(old_meta_path); diff --git a/crates/bevy_gizmos/src/arcs.rs b/crates/bevy_gizmos/src/arcs.rs index c2b8b1f325..14c260dd30 100644 --- a/crates/bevy_gizmos/src/arcs.rs +++ b/crates/bevy_gizmos/src/arcs.rs @@ -31,7 +31,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use std::f32::consts::PI; /// # use bevy_color::palettes::basic::{GREEN, RED}; @@ -168,7 +167,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use std::f32::consts::PI; /// # use bevy_color::palettes::css::ORANGE; @@ -225,7 +223,6 @@ where /// # Examples /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::css::ORANGE; /// fn system(mut gizmos: Gizmos) { @@ -272,7 +269,6 @@ where /// # Examples /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::css::ORANGE; /// fn system(mut gizmos: Gizmos) { diff --git a/crates/bevy_gizmos/src/arrows.rs b/crates/bevy_gizmos/src/arrows.rs index 4bde0a7f60..29d5119e79 100644 --- a/crates/bevy_gizmos/src/arrows.rs +++ b/crates/bevy_gizmos/src/arrows.rs @@ -36,7 +36,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -114,7 +113,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -146,7 +144,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { diff --git a/crates/bevy_gizmos/src/circles.rs b/crates/bevy_gizmos/src/circles.rs index 9cc2b1b47d..1f1d2bac21 100644 --- a/crates/bevy_gizmos/src/circles.rs +++ b/crates/bevy_gizmos/src/circles.rs @@ -31,7 +31,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::{RED, GREEN}; /// fn system(mut gizmos: Gizmos) { @@ -70,7 +69,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::{RED, GREEN}; /// fn system(mut gizmos: Gizmos) { @@ -109,7 +107,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::{RED, GREEN}; /// fn system(mut gizmos: Gizmos) { @@ -148,7 +145,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::{RED, GREEN}; /// fn system(mut gizmos: Gizmos) { @@ -186,7 +182,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::Color; /// fn system(mut gizmos: Gizmos) { diff --git a/crates/bevy_gizmos/src/config.rs b/crates/bevy_gizmos/src/config.rs index 7f2dba96df..0705029ddf 100644 --- a/crates/bevy_gizmos/src/config.rs +++ b/crates/bevy_gizmos/src/config.rs @@ -3,7 +3,13 @@ use crate as bevy_gizmos; pub use bevy_gizmos_macros::GizmoConfigGroup; -use bevy_ecs::{component::Component, reflect::ReflectResource, system::Resource}; +#[cfg(all( + feature = "bevy_render", + any(feature = "bevy_pbr", feature = "bevy_sprite") +))] +use bevy_ecs::component::Component; + +use bevy_ecs::{reflect::ReflectResource, system::Resource}; use bevy_reflect::{std_traits::ReflectDefault, Reflect, TypePath}; use bevy_utils::TypeIdMap; use core::panic; @@ -186,7 +192,10 @@ impl Default for GizmoConfig { } } -#[cfg(feature = "bevy_render")] +#[cfg(all( + feature = "bevy_render", + any(feature = "bevy_pbr", feature = "bevy_sprite") +))] #[derive(Component)] pub(crate) struct GizmoMeshConfig { pub line_perspective: bool, @@ -194,7 +203,10 @@ pub(crate) struct GizmoMeshConfig { pub render_layers: bevy_render::view::RenderLayers, } -#[cfg(feature = "bevy_render")] +#[cfg(all( + feature = "bevy_render", + any(feature = "bevy_pbr", feature = "bevy_sprite") +))] impl From<&GizmoConfig> for GizmoMeshConfig { fn from(item: &GizmoConfig) -> Self { GizmoMeshConfig { diff --git a/crates/bevy_gizmos/src/cross.rs b/crates/bevy_gizmos/src/cross.rs index 4d716a9dd4..282f6c3dfd 100644 --- a/crates/bevy_gizmos/src/cross.rs +++ b/crates/bevy_gizmos/src/cross.rs @@ -18,7 +18,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::WHITE; /// fn system(mut gizmos: Gizmos) { @@ -51,7 +50,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::WHITE; /// fn system(mut gizmos: Gizmos) { diff --git a/crates/bevy_gizmos/src/gizmos.rs b/crates/bevy_gizmos/src/gizmos.rs index bcd3ef0d5a..bd32ba8f1f 100644 --- a/crates/bevy_gizmos/src/gizmos.rs +++ b/crates/bevy_gizmos/src/gizmos.rs @@ -280,7 +280,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -304,7 +303,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::{RED, GREEN}; /// fn system(mut gizmos: Gizmos) { @@ -334,7 +332,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -357,7 +354,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::{RED, GREEN}; /// fn system(mut gizmos: Gizmos) { @@ -386,7 +382,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -417,7 +412,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::{BLUE, GREEN, RED}; /// fn system(mut gizmos: Gizmos) { @@ -465,7 +459,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -489,7 +482,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_transform::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -530,7 +522,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -553,7 +544,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::{RED, GREEN}; /// fn system(mut gizmos: Gizmos) { @@ -582,7 +572,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -609,7 +598,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::{RED, GREEN, BLUE}; /// fn system(mut gizmos: Gizmos) { @@ -643,7 +631,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -666,7 +653,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::{RED, GREEN}; /// fn system(mut gizmos: Gizmos) { @@ -695,7 +681,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { diff --git a/crates/bevy_gizmos/src/grid.rs b/crates/bevy_gizmos/src/grid.rs index 7b5eba9da1..b65137205b 100644 --- a/crates/bevy_gizmos/src/grid.rs +++ b/crates/bevy_gizmos/src/grid.rs @@ -201,7 +201,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -257,7 +256,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -313,7 +311,6 @@ where /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::basic::GREEN; /// fn system(mut gizmos: Gizmos) { diff --git a/crates/bevy_gizmos/src/lib.rs b/crates/bevy_gizmos/src/lib.rs index 6681baa709..d5a20bc5c5 100644 --- a/crates/bevy_gizmos/src/lib.rs +++ b/crates/bevy_gizmos/src/lib.rs @@ -9,7 +9,6 @@ //! # Example //! ``` //! # use bevy_gizmos::prelude::*; -//! # use bevy_render::prelude::*; //! # use bevy_math::prelude::*; //! # use bevy_color::palettes::basic::GREEN; //! fn system(mut gizmos: Gizmos) { @@ -70,20 +69,31 @@ pub mod prelude { pub use crate::light::{LightGizmoColor, LightGizmoConfigGroup, ShowLightGizmo}; } +#[cfg(feature = "bevy_render")] +use bevy_ecs::{ + query::ROQueryItem, + system::{ + lifetimeless::{Read, SRes}, + Commands, SystemParamItem, + }, +}; + use bevy_app::{App, FixedFirst, FixedLast, Last, Plugin, RunFixedMainLoop}; use bevy_asset::{Asset, AssetApp, Assets, Handle}; use bevy_color::LinearRgba; +#[cfg(feature = "bevy_render")] +use bevy_ecs::component::Component; use bevy_ecs::{ - component::Component, - query::ROQueryItem, schedule::{IntoSystemConfigs, SystemSet}, - system::{ - lifetimeless::{Read, SRes}, - Commands, Res, ResMut, Resource, SystemParamItem, - }, + system::{Res, ResMut, Resource}, }; use bevy_math::Vec3; use bevy_reflect::TypePath; +#[cfg(all( + feature = "bevy_render", + any(feature = "bevy_pbr", feature = "bevy_sprite"), +))] +use bevy_render::render_resource::{VertexAttribute, VertexBufferLayout, VertexStepMode}; #[cfg(feature = "bevy_render")] use bevy_render::{ extract_component::{ComponentUniforms, DynamicUniformIndex, UniformComponentPlugin}, @@ -92,19 +102,21 @@ use bevy_render::{ render_resource::{ binding_types::uniform_buffer, BindGroup, BindGroupEntries, BindGroupLayout, BindGroupLayoutEntries, Buffer, BufferInitDescriptor, BufferUsages, Shader, ShaderStages, - ShaderType, VertexAttribute, VertexBufferLayout, VertexFormat, VertexStepMode, + ShaderType, VertexFormat, }, renderer::RenderDevice, Extract, ExtractSchedule, Render, RenderApp, RenderSet, }; + use bevy_time::Fixed; use bevy_utils::TypeIdMap; +#[cfg(feature = "bevy_render")] use bytemuck::cast_slice; use config::{ DefaultGizmoConfigGroup, GizmoConfig, GizmoConfigGroup, GizmoConfigStore, GizmoLineJoint, }; use gizmos::{GizmoStorage, Swap}; -#[cfg(feature = "bevy_pbr")] +#[cfg(all(feature = "bevy_pbr", feature = "bevy_render"))] use light::LightGizmoPlugin; use std::{any::TypeId, mem}; @@ -145,7 +157,7 @@ impl Plugin for GizmoPlugin { .add_plugins(UniformComponentPlugin::::default()) .add_plugins(RenderAssetPlugin::::default()); - #[cfg(feature = "bevy_pbr")] + #[cfg(all(feature = "bevy_pbr", feature = "bevy_render"))] app.add_plugins(LightGizmoPlugin); #[cfg(feature = "bevy_render")] @@ -436,6 +448,7 @@ fn extract_gizmo_data( _padding: Default::default(), }, (*handle).clone_weak(), + #[cfg(any(feature = "bevy_pbr", feature = "bevy_sprite"))] config::GizmoMeshConfig::from(config), )); } @@ -676,7 +689,10 @@ impl RenderCommand

for DrawLineJointGizmo { } } -#[cfg(feature = "bevy_render")] +#[cfg(all( + feature = "bevy_render", + any(feature = "bevy_pbr", feature = "bevy_sprite") +))] fn line_gizmo_vertex_buffer_layouts(strip: bool) -> Vec { use VertexFormat::*; let mut position_layout = VertexBufferLayout { @@ -731,7 +747,10 @@ fn line_gizmo_vertex_buffer_layouts(strip: bool) -> Vec { } } -#[cfg(feature = "bevy_render")] +#[cfg(all( + feature = "bevy_render", + any(feature = "bevy_pbr", feature = "bevy_sprite") +))] fn line_joint_gizmo_vertex_buffer_layouts() -> Vec { use VertexFormat::*; let mut position_layout = VertexBufferLayout { diff --git a/crates/bevy_gizmos/src/rounded_box.rs b/crates/bevy_gizmos/src/rounded_box.rs index d4dbd54c1a..232bcee6df 100644 --- a/crates/bevy_gizmos/src/rounded_box.rs +++ b/crates/bevy_gizmos/src/rounded_box.rs @@ -227,7 +227,6 @@ impl<'w, 's, T: GizmoConfigGroup> Gizmos<'w, 's, T> { /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::css::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -283,7 +282,6 @@ impl<'w, 's, T: GizmoConfigGroup> Gizmos<'w, 's, T> { /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::css::GREEN; /// fn system(mut gizmos: Gizmos) { @@ -339,7 +337,6 @@ impl<'w, 's, T: GizmoConfigGroup> Gizmos<'w, 's, T> { /// # Example /// ``` /// # use bevy_gizmos::prelude::*; - /// # use bevy_render::prelude::*; /// # use bevy_math::prelude::*; /// # use bevy_color::palettes::css::GREEN; /// fn system(mut gizmos: Gizmos) {