 d70595b667
			
		
	
	
		d70595b667
		
			
		
	
	
	
	
		
			
			# Objective - Fixes #6370 - Closes #6581 ## Solution - Added the following lints to the workspace: - `std_instead_of_core` - `std_instead_of_alloc` - `alloc_instead_of_core` - Used `cargo +nightly fmt` with [item level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Item%5C%3A) to split all `use` statements into single items. - Used `cargo clippy --workspace --all-targets --all-features --fix --allow-dirty` to _attempt_ to resolve the new linting issues, and intervened where the lint was unable to resolve the issue automatically (usually due to needing an `extern crate alloc;` statement in a crate root). - Manually removed certain uses of `std` where negative feature gating prevented `--all-features` from finding the offending uses. - Used `cargo +nightly fmt` with [crate level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Crate%5C%3A) to re-merge all `use` statements matching Bevy's previous styling. - Manually fixed cases where the `fmt` tool could not re-merge `use` statements due to conditional compilation attributes. ## Testing - Ran CI locally ## Migration Guide The MSRV is now 1.81. Please update to this version or higher. ## Notes - This is a _massive_ change to try and push through, which is why I've outlined the semi-automatic steps I used to create this PR, in case this fails and someone else tries again in the future. - Making this change has no impact on user code, but does mean Bevy contributors will be warned to use `core` and `alloc` instead of `std` where possible. - This lint is a critical first step towards investigating `no_std` options for Bevy. --------- Co-authored-by: François Mockers <francois.mockers@vleue.com>
		
			
				
	
	
		
			149 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			149 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! Convenience logic for turning components from the main world into extracted
 | |
| //! instances in the render world.
 | |
| //!
 | |
| //! This is essentially the same as the `extract_component` module, but
 | |
| //! higher-performance because it avoids the ECS overhead.
 | |
| 
 | |
| use core::marker::PhantomData;
 | |
| 
 | |
| use bevy_app::{App, Plugin};
 | |
| use bevy_asset::{Asset, AssetId, Handle};
 | |
| use bevy_derive::{Deref, DerefMut};
 | |
| use bevy_ecs::{
 | |
|     entity::EntityHashMap,
 | |
|     prelude::Entity,
 | |
|     query::{QueryFilter, QueryItem, ReadOnlyQueryData},
 | |
|     system::{lifetimeless::Read, Query, ResMut, Resource},
 | |
| };
 | |
| 
 | |
| use crate::{prelude::ViewVisibility, Extract, ExtractSchedule, RenderApp};
 | |
| 
 | |
| /// Describes how to extract data needed for rendering from a component or
 | |
| /// components.
 | |
| ///
 | |
| /// Before rendering, any applicable components will be transferred from the
 | |
| /// main world to the render world in the [`ExtractSchedule`] step.
 | |
| ///
 | |
| /// This is essentially the same as
 | |
| /// [`ExtractComponent`](crate::extract_component::ExtractComponent), but
 | |
| /// higher-performance because it avoids the ECS overhead.
 | |
| pub trait ExtractInstance: Send + Sync + Sized + 'static {
 | |
|     /// ECS [`ReadOnlyQueryData`] to fetch the components to extract.
 | |
|     type QueryData: ReadOnlyQueryData;
 | |
|     /// Filters the entities with additional constraints.
 | |
|     type QueryFilter: QueryFilter;
 | |
| 
 | |
|     /// Defines how the component is transferred into the "render world".
 | |
|     fn extract(item: QueryItem<'_, Self::QueryData>) -> Option<Self>;
 | |
| }
 | |
| 
 | |
| /// This plugin extracts one or more components into the "render world" as
 | |
| /// extracted instances.
 | |
| ///
 | |
| /// Therefore it sets up the [`ExtractSchedule`] step for the specified
 | |
| /// [`ExtractedInstances`].
 | |
| #[derive(Default)]
 | |
| pub struct ExtractInstancesPlugin<EI>
 | |
| where
 | |
|     EI: ExtractInstance,
 | |
| {
 | |
|     only_extract_visible: bool,
 | |
|     marker: PhantomData<fn() -> EI>,
 | |
| }
 | |
| 
 | |
| /// Stores all extract instances of a type in the render world.
 | |
| #[derive(Resource, Deref, DerefMut)]
 | |
| pub struct ExtractedInstances<EI>(EntityHashMap<EI>)
 | |
| where
 | |
|     EI: ExtractInstance;
 | |
| 
 | |
| impl<EI> Default for ExtractedInstances<EI>
 | |
| where
 | |
|     EI: ExtractInstance,
 | |
| {
 | |
|     fn default() -> Self {
 | |
|         Self(Default::default())
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl<EI> ExtractInstancesPlugin<EI>
 | |
| where
 | |
|     EI: ExtractInstance,
 | |
| {
 | |
|     /// Creates a new [`ExtractInstancesPlugin`] that unconditionally extracts to
 | |
|     /// the render world, whether the entity is visible or not.
 | |
|     pub fn new() -> Self {
 | |
|         Self {
 | |
|             only_extract_visible: false,
 | |
|             marker: PhantomData,
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     /// Creates a new [`ExtractInstancesPlugin`] that extracts to the render world
 | |
|     /// if and only if the entity it's attached to is visible.
 | |
|     pub fn extract_visible() -> Self {
 | |
|         Self {
 | |
|             only_extract_visible: true,
 | |
|             marker: PhantomData,
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl<EI> Plugin for ExtractInstancesPlugin<EI>
 | |
| where
 | |
|     EI: ExtractInstance,
 | |
| {
 | |
|     fn build(&self, app: &mut App) {
 | |
|         if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
 | |
|             render_app.init_resource::<ExtractedInstances<EI>>();
 | |
|             if self.only_extract_visible {
 | |
|                 render_app.add_systems(ExtractSchedule, extract_visible::<EI>);
 | |
|             } else {
 | |
|                 render_app.add_systems(ExtractSchedule, extract_all::<EI>);
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| fn extract_all<EI>(
 | |
|     mut extracted_instances: ResMut<ExtractedInstances<EI>>,
 | |
|     query: Extract<Query<(Entity, EI::QueryData), EI::QueryFilter>>,
 | |
| ) where
 | |
|     EI: ExtractInstance,
 | |
| {
 | |
|     extracted_instances.clear();
 | |
|     for (entity, other) in &query {
 | |
|         if let Some(extract_instance) = EI::extract(other) {
 | |
|             extracted_instances.insert(entity, extract_instance);
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| fn extract_visible<EI>(
 | |
|     mut extracted_instances: ResMut<ExtractedInstances<EI>>,
 | |
|     query: Extract<Query<(Entity, &ViewVisibility, EI::QueryData), EI::QueryFilter>>,
 | |
| ) where
 | |
|     EI: ExtractInstance,
 | |
| {
 | |
|     extracted_instances.clear();
 | |
|     for (entity, view_visibility, other) in &query {
 | |
|         if view_visibility.get() {
 | |
|             if let Some(extract_instance) = EI::extract(other) {
 | |
|                 extracted_instances.insert(entity, extract_instance);
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl<A> ExtractInstance for AssetId<A>
 | |
| where
 | |
|     A: Asset,
 | |
| {
 | |
|     type QueryData = Read<Handle<A>>;
 | |
|     type QueryFilter = ();
 | |
| 
 | |
|     fn extract(item: QueryItem<'_, Self::QueryData>) -> Option<Self> {
 | |
|         Some(item.id())
 | |
|     }
 | |
| }
 |