 aa2ebbb43f
			
		
	
	
		aa2ebbb43f
		
			
		
	
	
	
	
		
			
			# Objective - I daily drive nightly Rust when developing Bevy, so I notice when new warnings are raised by `cargo check` and Clippy. - `cargo +nightly clippy` raises a few of these new warnings. ## Solution - Fix most warnings from `cargo +nightly clippy` - I skipped the docs-related warnings because some were covered by #12692. - Use `Clone::clone_from` in applicable scenarios, which can sometimes avoid an extra allocation. - Implement `Default` for structs that have a `pub const fn new() -> Self` method. - Fix an occurrence where generic constraints were defined in both `<C: Trait>` and `where C: Trait`. - Removed generic constraints that were implied by the `Bundle` trait. --- ## Changelog - `BatchingStrategy`, `NonGenericTypeCell`, and `GenericTypeCell` now implement `Default`.
		
			
				
	
	
		
			241 lines
		
	
	
		
			7.5 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			241 lines
		
	
	
		
			7.5 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use crate::{
 | |
|     render_resource::{encase::internal::WriteInto, DynamicUniformBuffer, ShaderType},
 | |
|     renderer::{RenderDevice, RenderQueue},
 | |
|     view::ViewVisibility,
 | |
|     Extract, ExtractSchedule, Render, RenderApp, RenderSet,
 | |
| };
 | |
| use bevy_app::{App, Plugin};
 | |
| use bevy_asset::{Asset, Handle};
 | |
| use bevy_ecs::{
 | |
|     component::Component,
 | |
|     prelude::*,
 | |
|     query::{QueryFilter, QueryItem, ReadOnlyQueryData},
 | |
|     system::lifetimeless::Read,
 | |
| };
 | |
| use std::{marker::PhantomData, ops::Deref};
 | |
| 
 | |
| pub use bevy_render_macros::ExtractComponent;
 | |
| 
 | |
| /// Stores the index of a uniform inside of [`ComponentUniforms`].
 | |
| #[derive(Component)]
 | |
| pub struct DynamicUniformIndex<C: Component> {
 | |
|     index: u32,
 | |
|     marker: PhantomData<C>,
 | |
| }
 | |
| 
 | |
| impl<C: Component> DynamicUniformIndex<C> {
 | |
|     #[inline]
 | |
|     pub fn index(&self) -> u32 {
 | |
|         self.index
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// Describes how a component gets extracted for rendering.
 | |
| ///
 | |
| /// Therefore the component is transferred from the "app world" into the "render world"
 | |
| /// in the [`ExtractSchedule`] step.
 | |
| pub trait ExtractComponent: Component {
 | |
|     /// ECS [`ReadOnlyQueryData`] to fetch the components to extract.
 | |
|     type QueryData: ReadOnlyQueryData;
 | |
|     /// Filters the entities with additional constraints.
 | |
|     type QueryFilter: QueryFilter;
 | |
| 
 | |
|     /// The output from extraction.
 | |
|     ///
 | |
|     /// Returning `None` based on the queried item can allow early optimization,
 | |
|     /// for example if there is an `enabled: bool` field on `Self`, or by only accepting
 | |
|     /// values within certain thresholds.
 | |
|     ///
 | |
|     /// The output may be different from the queried component.
 | |
|     /// This can be useful for example if only a subset of the fields are useful
 | |
|     /// in the render world.
 | |
|     ///
 | |
|     /// `Out` has a [`Bundle`] trait bound instead of a [`Component`] trait bound in order to allow use cases
 | |
|     /// such as tuples of components as output.
 | |
|     type Out: Bundle;
 | |
| 
 | |
|     // TODO: https://github.com/rust-lang/rust/issues/29661
 | |
|     // type Out: Component = Self;
 | |
| 
 | |
|     /// Defines how the component is transferred into the "render world".
 | |
|     fn extract_component(item: QueryItem<'_, Self::QueryData>) -> Option<Self::Out>;
 | |
| }
 | |
| 
 | |
| /// This plugin prepares the components of the corresponding type for the GPU
 | |
| /// by transforming them into uniforms.
 | |
| ///
 | |
| /// They can then be accessed from the [`ComponentUniforms`] resource.
 | |
| /// For referencing the newly created uniforms a [`DynamicUniformIndex`] is inserted
 | |
| /// for every processed entity.
 | |
| ///
 | |
| /// Therefore it sets up the [`RenderSet::Prepare`] step
 | |
| /// for the specified [`ExtractComponent`].
 | |
| pub struct UniformComponentPlugin<C>(PhantomData<fn() -> C>);
 | |
| 
 | |
| impl<C> Default for UniformComponentPlugin<C> {
 | |
|     fn default() -> Self {
 | |
|         Self(PhantomData)
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl<C: Component + ShaderType + WriteInto + Clone> Plugin for UniformComponentPlugin<C> {
 | |
|     fn build(&self, app: &mut App) {
 | |
|         if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
 | |
|             render_app
 | |
|                 .insert_resource(ComponentUniforms::<C>::default())
 | |
|                 .add_systems(
 | |
|                     Render,
 | |
|                     prepare_uniform_components::<C>.in_set(RenderSet::PrepareResources),
 | |
|                 );
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// Stores all uniforms of the component type.
 | |
| #[derive(Resource)]
 | |
| pub struct ComponentUniforms<C: Component + ShaderType> {
 | |
|     uniforms: DynamicUniformBuffer<C>,
 | |
| }
 | |
| 
 | |
| impl<C: Component + ShaderType> Deref for ComponentUniforms<C> {
 | |
|     type Target = DynamicUniformBuffer<C>;
 | |
| 
 | |
|     #[inline]
 | |
|     fn deref(&self) -> &Self::Target {
 | |
|         &self.uniforms
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl<C: Component + ShaderType> ComponentUniforms<C> {
 | |
|     #[inline]
 | |
|     pub fn uniforms(&self) -> &DynamicUniformBuffer<C> {
 | |
|         &self.uniforms
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl<C: Component + ShaderType> Default for ComponentUniforms<C> {
 | |
|     fn default() -> Self {
 | |
|         Self {
 | |
|             uniforms: Default::default(),
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// This system prepares all components of the corresponding component type.
 | |
| /// They are transformed into uniforms and stored in the [`ComponentUniforms`] resource.
 | |
| fn prepare_uniform_components<C>(
 | |
|     mut commands: Commands,
 | |
|     render_device: Res<RenderDevice>,
 | |
|     render_queue: Res<RenderQueue>,
 | |
|     mut component_uniforms: ResMut<ComponentUniforms<C>>,
 | |
|     components: Query<(Entity, &C)>,
 | |
| ) where
 | |
|     C: Component + ShaderType + WriteInto + Clone,
 | |
| {
 | |
|     let components_iter = components.iter();
 | |
|     let count = components_iter.len();
 | |
|     let Some(mut writer) =
 | |
|         component_uniforms
 | |
|             .uniforms
 | |
|             .get_writer(count, &render_device, &render_queue)
 | |
|     else {
 | |
|         return;
 | |
|     };
 | |
|     let entities = components_iter
 | |
|         .map(|(entity, component)| {
 | |
|             (
 | |
|                 entity,
 | |
|                 DynamicUniformIndex::<C> {
 | |
|                     index: writer.write(component),
 | |
|                     marker: PhantomData,
 | |
|                 },
 | |
|             )
 | |
|         })
 | |
|         .collect::<Vec<_>>();
 | |
|     commands.insert_or_spawn_batch(entities);
 | |
| }
 | |
| 
 | |
| /// This plugin extracts the components into the "render world".
 | |
| ///
 | |
| /// Therefore it sets up the [`ExtractSchedule`] step
 | |
| /// for the specified [`ExtractComponent`].
 | |
| pub struct ExtractComponentPlugin<C, F = ()> {
 | |
|     only_extract_visible: bool,
 | |
|     marker: PhantomData<fn() -> (C, F)>,
 | |
| }
 | |
| 
 | |
| impl<C, F> Default for ExtractComponentPlugin<C, F> {
 | |
|     fn default() -> Self {
 | |
|         Self {
 | |
|             only_extract_visible: false,
 | |
|             marker: PhantomData,
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl<C, F> ExtractComponentPlugin<C, F> {
 | |
|     pub fn extract_visible() -> Self {
 | |
|         Self {
 | |
|             only_extract_visible: true,
 | |
|             marker: PhantomData,
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl<C: ExtractComponent> Plugin for ExtractComponentPlugin<C> {
 | |
|     fn build(&self, app: &mut App) {
 | |
|         if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
 | |
|             if self.only_extract_visible {
 | |
|                 render_app.add_systems(ExtractSchedule, extract_visible_components::<C>);
 | |
|             } else {
 | |
|                 render_app.add_systems(ExtractSchedule, extract_components::<C>);
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl<T: Asset> ExtractComponent for Handle<T> {
 | |
|     type QueryData = Read<Handle<T>>;
 | |
|     type QueryFilter = ();
 | |
|     type Out = Handle<T>;
 | |
| 
 | |
|     #[inline]
 | |
|     fn extract_component(handle: QueryItem<'_, Self::QueryData>) -> Option<Self::Out> {
 | |
|         Some(handle.clone_weak())
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// This system extracts all components of the corresponding [`ExtractComponent`] type.
 | |
| fn extract_components<C: ExtractComponent>(
 | |
|     mut commands: Commands,
 | |
|     mut previous_len: Local<usize>,
 | |
|     query: Extract<Query<(Entity, C::QueryData), C::QueryFilter>>,
 | |
| ) {
 | |
|     let mut values = Vec::with_capacity(*previous_len);
 | |
|     for (entity, query_item) in &query {
 | |
|         if let Some(component) = C::extract_component(query_item) {
 | |
|             values.push((entity, component));
 | |
|         }
 | |
|     }
 | |
|     *previous_len = values.len();
 | |
|     commands.insert_or_spawn_batch(values);
 | |
| }
 | |
| 
 | |
| /// This system extracts all visible components of the corresponding [`ExtractComponent`] type.
 | |
| fn extract_visible_components<C: ExtractComponent>(
 | |
|     mut commands: Commands,
 | |
|     mut previous_len: Local<usize>,
 | |
|     query: Extract<Query<(Entity, &ViewVisibility, C::QueryData), C::QueryFilter>>,
 | |
| ) {
 | |
|     let mut values = Vec::with_capacity(*previous_len);
 | |
|     for (entity, view_visibility, query_item) in &query {
 | |
|         if view_visibility.get() {
 | |
|             if let Some(component) = C::extract_component(query_item) {
 | |
|                 values.push((entity, component));
 | |
|             }
 | |
|         }
 | |
|     }
 | |
|     *previous_len = values.len();
 | |
|     commands.insert_or_spawn_batch(values);
 | |
| }
 |