Cleanup

Author: Zeophlite

crates/bevy_core_pipeline/src/core_3d/mod.rs

@@ -44,9 +44,9 @@ pub use main_transparent_pass_3d_node::*;
 use bevy_app::{App, Plugin, PostUpdate};
 use bevy_asset::UntypedAssetId;
 use bevy_color::LinearRgba;
-use bevy_ecs::{prelude::*, query::QueryItem};
+use bevy_ecs::prelude::*;
 use bevy_extract::{
-    extract_component::{ExtractComponent, ExtractComponentPlugin},
+    extract_component::ExtractComponentPlugin,
     sync_world::{MainEntity, RenderEntity},
     Extract, ExtractSchedule, Render, RenderApp, RenderSystems,
 };

crates/bevy_extract/macros/src/lib.rs

@@ -11,10 +11,6 @@ pub(crate) fn bevy_extract_path() -> syn::Path {
     BevyManifest::shared(|manifest| manifest.get_path("bevy_extract"))
 }
 
-pub(crate) fn bevy_ecs_path() -> syn::Path {
-    BevyManifest::shared(|manifest| manifest.get_path("bevy_ecs"))
-}
-
 #[proc_macro_derive(ExtractResource)]
 pub fn derive_extract_resource(input: TokenStream) -> TokenStream {
     extract_resource::derive_extract_resource(input)

crates/bevy_extract/src/extract_component.rs

@@ -1,7 +1,7 @@
 use crate::{
     sync_component::{SyncComponent, SyncComponentPlugin},
     sync_world::RenderEntity,
-    Extract, ExtractSchedule, Render, RenderApp, RenderSystems,
+    Extract, ExtractSchedule, RenderApp,
 };
 use bevy_app::{App, Plugin};
 use bevy_camera::visibility::ViewVisibility;
@@ -10,7 +10,7 @@ use bevy_ecs::{
     prelude::*,
     query::{QueryFilter, QueryItem, ReadOnlyQueryData},
 };
-use core::{marker::PhantomData, ops::Deref};
+use core::marker::PhantomData;
 
 pub use bevy_extract_macros::ExtractComponent;
 

crates/bevy_extract/src/lib.rs

@@ -1,3 +1,4 @@
+#![expect(missing_docs, reason = "Not all docs are written yet, see #3492.")]
 #![cfg_attr(
     any(docsrs, docsrs_dep),
     expect(
@@ -60,6 +61,8 @@ pub enum RenderSystems {
     /// Queue drawable entities as phase items in render phases ready for
     /// sorting (if necessary)
     Queue,
+    /// Ensures `prepare_assets::<RenderMesh>` is completed.
+    BikeshedPrepareAssetsRenderMesh,
     /// A sub-set within [`Queue`](RenderSystems::Queue) where mesh entity queue systems are executed. Ensures `prepare_assets::<RenderMesh>` is completed.
     QueueMeshes,
     /// A sub-set within [`Queue`](RenderSystems::Queue) where meshes that have
@@ -124,9 +127,8 @@ impl Render {
 
         schedule.configure_sets((ExtractCommands, PrepareAssets, PrepareMeshes, Prepare).chain());
         schedule.configure_sets(
-            (QueueMeshes, QueueSweep).chain().in_set(Queue),
-            // TODO: EXTRACT: fix this prepare_assets::<RenderMesh>
-            // .after(prepare_assets::<RenderMesh>),
+            (QueueMeshes, QueueSweep).chain().in_set(Queue), // TODO: EXTRACT: orignally just had below, but these are in scope yet
+                                                             // .after(prepare_assets::<RenderMesh>),
         );
         schedule.configure_sets(
             (

crates/bevy_pbr/src/material.rs

@@ -51,7 +51,6 @@ use bevy_render::RenderStartup;
 use bevy_render::{
     batching::gpu_preprocessing::GpuPreprocessingSupport,
     mesh::RenderMesh,
-    prelude::*,
     render_phase::*,
     render_resource::*,
     renderer::RenderDevice,

crates/bevy_pbr/src/wireframe.rs

@@ -35,7 +35,6 @@ use bevy_render::{
         allocator::{MeshAllocator, SlabId},
         RenderMesh,
     },
-    prelude::*,
     render_asset::{
         prepare_assets, PrepareAssetError, RenderAsset, RenderAssetPlugin, RenderAssets,
     },

crates/bevy_render/src/extract_component.rs

@@ -3,17 +3,10 @@ use crate::{
     renderer::{RenderDevice, RenderQueue},
 };
 use bevy_app::{App, Plugin};
-use bevy_camera::visibility::ViewVisibility;
-use bevy_ecs::{
-    component::Component,
-    prelude::*,
-    query::{QueryFilter, QueryItem, ReadOnlyQueryData},
-};
+use bevy_ecs::{component::Component, prelude::*};
 use bevy_extract::{extract_component::DynamicUniformIndex, Render, RenderApp, RenderSystems};
 use core::{marker::PhantomData, ops::Deref};
 
-use bevy_extract_macros::ExtractComponent;
-
 /// This plugin prepares the components of the corresponding type for the GPU
 /// by transforming them into uniforms.
 ///

crates/bevy_render/src/lib.rs

@@ -71,8 +71,7 @@ use crate::{
     camera::CameraPlugin,
     error_handler::{RenderErrorHandler, RenderState},
     gpu_readback::GpuReadbackPlugin,
-    mesh::{MeshRenderAssetPlugin, RenderMesh},
-    render_asset::prepare_assets,
+    mesh::MeshRenderAssetPlugin,
     render_resource::PipelineCache,
     renderer::{render_system, RenderAdapterInfo},
     settings::RenderCreation,

crates/bevy_sprite_render/src/mesh2d/wireframe2d.rs

@@ -34,7 +34,6 @@ use bevy_render::{
         allocator::{MeshAllocator, SlabId},
         RenderMesh,
     },
-    prelude::*,
     render_asset::{
         prepare_assets, PrepareAssetError, RenderAsset, RenderAssetPlugin, RenderAssets,
     },

docs/cargo_features.md

@@ -76,6 +76,7 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |bevy_core_pipeline|Provides cameras and other basic render pipeline features|
 |bevy_debug_stepping|Enable stepping-based debugging of Bevy systems|
 |bevy_dev_tools|Provides a collection of developer tools|
+|bevy_extract|Adds extract|
 |bevy_gilrs|Adds gamepad support|
 |bevy_gizmos|Adds support for gizmos|
 |bevy_gizmos_render|Adds support for rendering gizmos|