Minor cleanup

Zeophlite · Zeophlite · commit 061c031dbb8a · 2026-02-22T01:08:27.000+08:00
Bah

Remove double up time channel

CI

More

fmt

fix examples

fmt
diff --git a/crates/bevy_anti_alias/src/contrast_adaptive_sharpening/mod.rs b/crates/bevy_anti_alias/src/contrast_adaptive_sharpening/mod.rs
@@ -10,9 +10,7 @@ use bevy_ecs::{prelude::*, query::QueryItem};
 use bevy_image::BevyDefault as _;
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::{
-    extract_component::{
-        ExtractBaseComponent, ExtractComponentPlugin, UniformComponentPlugin,
-    },
+    extract_component::{ExtractBaseComponent, ExtractComponentPlugin, UniformComponentPlugin},
     render_resource::{
         binding_types::{sampler, texture_2d, uniform_buffer},
         *,
diff --git a/crates/bevy_core_pipeline/src/fullscreen_material.rs b/crates/bevy_core_pipeline/src/fullscreen_material.rs
@@ -20,8 +20,8 @@ use bevy_ecs::{
 use bevy_image::BevyDefault;
 use bevy_render::{
     extract_component::{
-        ComponentUniforms, DynamicUniformIndex, ExtractBaseComponent,
-        ExtractComponentPlugin, UniformComponentPlugin,
+        ComponentUniforms, DynamicUniformIndex, ExtractBaseComponent, ExtractComponentPlugin,
+        UniformComponentPlugin,
     },
     render_resource::{
         binding_types::{sampler, texture_2d, uniform_buffer},
diff --git a/crates/bevy_dev_tools/src/render_debug.rs b/crates/bevy_dev_tools/src/render_debug.rs
@@ -61,8 +61,8 @@ impl Plugin for RenderDebugOverlayPlugin {
             .init_resource::<GlobalRenderDebugOverlay>()
             .add_message::<RenderDebugOverlayEvent>()
             .add_plugins((
-                ExtractResourcePlugin::<GlobalRenderDebugOverlay>::default(),
-                ExtractComponentPlugin::<RenderDebugOverlay>::default(),
+                ExtractResourcePlugin::<GlobalRenderDebugOverlay>::new(RenderApp),
+                ExtractComponentPlugin::<RenderDebugOverlay>::new(RenderApp),
             ))
             .add_systems(bevy_app::Update, (handle_input, update_overlay).chain());
     }
diff --git a/crates/bevy_extract/src/extract_plugin.rs b/crates/bevy_extract/src/extract_plugin.rs
@@ -72,9 +72,6 @@ impl Plugin for ExtractPlugin {
             extract(main_world, render_world);
         });
 
-        let (sender, receiver) = bevy_time::create_time_channels();
-        sub_app.insert_resource(sender);
-        app.insert_resource(receiver);
         app.insert_sub_app(self.app_label, sub_app);
     }
 }
diff --git a/crates/bevy_pbr/src/atmosphere/mod.rs b/crates/bevy_pbr/src/atmosphere/mod.rs
@@ -53,6 +53,12 @@ use bevy_ecs::{
 use bevy_light::{atmosphere::ScatteringMedium, Atmosphere};
 use bevy_math::{UVec2, UVec3, Vec3};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
+use bevy_render::{
+    extract_component::ExtractComponentPlugin,
+    render_resource::{TextureFormat, TextureUsages},
+    renderer::RenderAdapter,
+    Render, RenderApp, RenderSystems,
+};
 use bevy_render::{
     extract_component::{ExtractBaseComponent, UniformComponentPlugin},
     render_resource::{DownlevelFlags, ShaderType, SpecializedRenderPipelines},
@@ -61,12 +67,6 @@ use bevy_render::{
     sync_world::RenderEntity,
     Extract, ExtractSchedule, RenderStartup,
 };
-use bevy_render::{
-    extract_component::ExtractComponentPlugin,
-    render_resource::{TextureFormat, TextureUsages},
-    renderer::RenderAdapter,
-    Render, RenderApp, RenderSystems,
-};
 
 use bevy_shader::load_shader_library;
 use environment::{
diff --git a/crates/bevy_pbr/src/light_probe/environment_map.rs b/crates/bevy_pbr/src/light_probe/environment_map.rs
@@ -49,11 +49,11 @@ use bevy_ecs::{
     query::{QueryData, QueryItem},
     system::lifetimeless::Read,
 };
-use bevy_extract::extract_instances::ExtractInstance;
 use bevy_image::Image;
 use bevy_light::{EnvironmentMapLight, ParallaxCorrection};
 use bevy_math::{Affine3A, Vec3};
 use bevy_render::{
+    extract_instances::ExtractInstance,
     render_asset::RenderAssets,
     render_resource::{
         binding_types::{self, uniform_buffer},
diff --git a/crates/bevy_pbr/src/light_probe/mod.rs b/crates/bevy_pbr/src/light_probe/mod.rs
@@ -12,14 +12,14 @@ use bevy_ecs::{
     schedule::IntoScheduleConfigs,
     system::{Commands, Local, Query, Res, ResMut},
 };
-use bevy_extract::extract_instances::ExtractInstancesPlugin;
 use bevy_image::Image;
 use bevy_light::{
     cluster::VisibleClusterableObjects, EnvironmentMapLight, IrradianceVolume, LightProbe,
 };
 use bevy_math::{Affine3A, FloatOrd, Mat4, Vec3, Vec4};
 use bevy_platform::collections::HashMap;
 use bevy_render::{
+    extract_instances::ExtractInstancesPlugin,
     render_asset::RenderAssets,
     render_resource::{DynamicUniformBuffer, Sampler, ShaderType, TextureView},
     renderer::{RenderAdapter, RenderAdapterInfo, RenderDevice, RenderQueue, WgpuWrapper},
diff --git a/crates/bevy_pbr/src/wireframe.rs b/crates/bevy_pbr/src/wireframe.rs
@@ -30,8 +30,7 @@ use bevy_render::{
         IndirectParametersNonIndexed,
     },
     camera::{
-        DirtySpecializationSystems, DirtyWireframeSpecializations,
-        ExtractedCamera, PendingQueues,
+        DirtySpecializationSystems, DirtyWireframeSpecializations, ExtractedCamera, PendingQueues,
     },
     extract_resource::ExtractResource,
     mesh::{
@@ -47,8 +46,8 @@ use bevy_render::{
         PhaseItemBatchSetKey, PhaseItemExtraIndex, RenderCommand, RenderCommandResult,
         SetItemPipeline, TrackedRenderPass, ViewBinnedRenderPhases,
     },
-    render_resource::*,
     render_resource::binding_types::*,
+    render_resource::*,
     renderer::{RenderContext, RenderDevice, RenderQueue, ViewQuery},
     sync_world::{MainEntity, MainEntityHashMap},
     view::{
diff --git a/crates/bevy_post_process/src/bloom/settings.rs b/crates/bevy_post_process/src/bloom/settings.rs
@@ -8,9 +8,7 @@ use bevy_ecs::{
 use bevy_math::{AspectRatio, URect, UVec4, Vec2, Vec4};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::{
-    extract_component::ExtractBaseComponent,
-    sync_component::SyncComponent,
-    RenderApp,
+    extract_component::ExtractBaseComponent, sync_component::SyncComponent, RenderApp,
 };
 
 /// Applies a bloom effect to an HDR-enabled 2d or 3d camera.
diff --git a/crates/bevy_post_process/src/effect_stack/chromatic_aberration.rs b/crates/bevy_post_process/src/effect_stack/chromatic_aberration.rs
@@ -10,10 +10,8 @@ use bevy_ecs::{
 use bevy_image::Image;
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::{
-    extract_component::ExtractBaseComponent,
-    render_resource::ShaderType,
-    sync_component::SyncComponent,
-    RenderApp,
+    extract_component::ExtractBaseComponent, render_resource::ShaderType,
+    sync_component::SyncComponent, RenderApp,
 };
 
 /// The raw RGBA data for the default chromatic aberration gradient.
diff --git a/crates/bevy_post_process/src/effect_stack/vignette.rs b/crates/bevy_post_process/src/effect_stack/vignette.rs
@@ -9,10 +9,8 @@ use bevy_ecs::{
 use bevy_math::{Vec2, Vec4};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::{
-    extract_component::ExtractBaseComponent,
-    render_resource::ShaderType,
-    sync_component::SyncComponent,
-    RenderApp,
+    extract_component::ExtractBaseComponent, render_resource::ShaderType,
+    sync_component::SyncComponent, RenderApp,
 };
 
 /// The default vignette intensity amount.
diff --git a/crates/bevy_post_process/src/motion_blur/mod.rs b/crates/bevy_post_process/src/motion_blur/mod.rs
@@ -24,8 +24,7 @@ use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::{
     diagnostic::RecordDiagnostics,
     extract_component::{
-        ComponentUniforms, ExtractBaseComponent, ExtractComponentPlugin,
-        UniformComponentPlugin,
+        ComponentUniforms, ExtractBaseComponent, ExtractComponentPlugin, UniformComponentPlugin,
     },
     globals::GlobalsBuffer,
     render_resource::{
diff --git a/crates/bevy_render/macros/src/extract_component.rs b/crates/bevy_render/macros/src/extract_component.rs
@@ -38,8 +38,6 @@ pub fn derive_extract_component(input: TokenStream) -> TokenStream {
         }
     };
 
-    // #bevy_render_path::RenderApp.intern()
-
     TokenStream::from(quote! {
         impl #impl_generics #bevy_render_path::sync_component::SyncComponent for #struct_name #type_generics #where_clause {
             type Out = Self;
diff --git a/crates/bevy_render/macros/src/extract_resource.rs b/crates/bevy_render/macros/src/extract_resource.rs
@@ -14,8 +14,6 @@ pub fn derive_extract_resource(input: TokenStream) -> TokenStream {
     let struct_name = &ast.ident;
     let (impl_generics, type_generics, where_clause) = &ast.generics.split_for_impl();
 
-    // #bevy_render_path::RenderApp.intern()
-
     TokenStream::from(quote! {
         impl #impl_generics #bevy_render_path::extract_resource::ExtractBaseResource<#bevy_render_path::RenderApp> for #struct_name #type_generics #where_clause {
             type Source = Self;
diff --git a/crates/bevy_render/src/extract_component.rs b/crates/bevy_render/src/extract_component.rs
@@ -4,10 +4,7 @@ use crate::{
     Render, RenderApp, RenderSystems,
 };
 use bevy_app::{App, Plugin};
-use bevy_ecs::{
-    component::Component,
-    prelude::*,
-};
+use bevy_ecs::{component::Component, prelude::*};
 use core::{marker::PhantomData, ops::Deref};
 
 use bevy_extract::extract_base_component::ExtractBaseComponentPlugin;
diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs
@@ -69,6 +69,9 @@ pub mod prelude {
 }
 
 // Re-exports
+pub mod extract_instances {
+    pub use bevy_extract::extract_instances::{ExtractInstance, ExtractInstancesPlugin};
+}
 pub mod sync_component {
     pub use bevy_extract::sync_component::{SyncComponent, SyncComponentPlugin};
 }
diff --git a/crates/bevy_solari/src/scene/extract.rs b/crates/bevy_solari/src/scene/extract.rs
@@ -7,7 +7,9 @@ use bevy_ecs::{
 };
 use bevy_pbr::{MeshMaterial3d, PreviousGlobalTransform, StandardMaterial};
 use bevy_platform::collections::HashMap;
-use bevy_render::{extract_resource::ExtractResource, sync_world::RenderEntity, Extract};
+use bevy_render::{
+    extract_resource::ExtractBaseResource, sync_world::RenderEntity, Extract, RenderApp,
+};
 use bevy_transform::components::GlobalTransform;
 
 pub fn extract_raytracing_scene(
@@ -40,7 +42,7 @@ pub fn extract_raytracing_scene(
 #[derive(Resource, Deref, Default)]
 pub struct StandardMaterialAssets(HashMap<AssetId<StandardMaterial>, StandardMaterial>);
 
-impl ExtractResource for StandardMaterialAssets {
+impl ExtractBaseResource<RenderApp> for StandardMaterialAssets {
     type Source = Assets<StandardMaterial>;
 
     fn extract_resource(source: &Self::Source) -> Self {
diff --git a/crates/bevy_solari/src/scene/mod.rs b/crates/bevy_solari/src/scene/mod.rs
@@ -48,7 +48,9 @@ impl Plugin for RaytracingScenePlugin {
             return;
         }
 
-        app.add_plugins(ExtractResourcePlugin::<StandardMaterialAssets>::default());
+        app.add_plugins(ExtractResourcePlugin::<StandardMaterialAssets>::new(
+            RenderApp,
+        ));
 
         let render_app = app.sub_app_mut(RenderApp);
 
diff --git a/crates/bevy_sprite_render/src/text2d/mod.rs b/crates/bevy_sprite_render/src/text2d/mod.rs
@@ -9,8 +9,8 @@ use bevy_ecs::{
     query::Has,
     system::{Commands, Query, ResMut},
 };
-use bevy_extract::sync_world::TemporaryRenderEntity;
 use bevy_math::{Vec2, Vec3};
+use bevy_render::sync_world::TemporaryRenderEntity;
 use bevy_render::Extract;
 use bevy_sprite::{Anchor, Text2dShadow};
 use bevy_text::{
diff --git a/examples/app/render_recovery.rs b/examples/app/render_recovery.rs
@@ -21,7 +21,7 @@ fn main() {
     let mut app = App::new();
     app.add_plugins((
         DefaultPlugins,
-        ExtractResourcePlugin::<RenderError>::default(),
+        ExtractResourcePlugin::<RenderError>::new(RenderApp),
     ))
     .add_systems(Startup, setup)
     .add_systems(Update, (update_camera, input))
diff --git a/examples/shader/compute_shader_game_of_life.rs b/examples/shader/compute_shader_game_of_life.rs
@@ -95,8 +95,8 @@ impl Plugin for GameOfLifeComputePlugin {
         // Extract the game of life image resource from the main world into the render world
         // for operation on by the compute shader and display on the sprite.
         app.add_plugins((
-            ExtractResourcePlugin::<GameOfLifeImages>::default(),
-            ExtractResourcePlugin::<GameOfLifeUniforms>::default(),
+            ExtractResourcePlugin::<GameOfLifeImages>::new(RenderApp),
+            ExtractResourcePlugin::<GameOfLifeUniforms>::new(RenderApp),
         ));
         let render_app = app.sub_app_mut(RenderApp);
         render_app
diff --git a/examples/shader/gpu_readback.rs b/examples/shader/gpu_readback.rs
@@ -30,8 +30,8 @@ fn main() {
         .add_plugins((
             DefaultPlugins,
             GpuReadbackPlugin,
-            ExtractResourcePlugin::<ReadbackBuffer>::default(),
-            ExtractResourcePlugin::<ReadbackImage>::default(),
+            ExtractResourcePlugin::<ReadbackBuffer>::new(RenderApp),
+            ExtractResourcePlugin::<ReadbackImage>::new(RenderApp),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, setup)
diff --git a/examples/shader_advanced/compute_mesh.rs b/examples/shader_advanced/compute_mesh.rs
@@ -38,7 +38,7 @@ fn main() {
         .add_plugins((
             DefaultPlugins,
             ComputeShaderMeshGeneratorPlugin,
-            ExtractComponentPlugin::<GenerateMesh>::default(),
+            ExtractComponentPlugin::<GenerateMesh>::new(RenderApp),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, setup)
diff --git a/examples/shader_advanced/custom_phase_item.rs b/examples/shader_advanced/custom_phase_item.rs
@@ -163,7 +163,9 @@ static VERTICES: [Vertex; 3] = [
 fn main() {
     let mut app = App::new();
     app.add_plugins(DefaultPlugins)
-        .add_plugins(ExtractComponentPlugin::<CustomRenderedEntity>::default())
+        .add_plugins(ExtractComponentPlugin::<CustomRenderedEntity>::new(
+            RenderApp,
+        ))
         .add_systems(Startup, setup);
 
     // We make sure to add these to the render app, not the main app.
diff --git a/examples/shader_advanced/custom_post_processing.rs b/examples/shader_advanced/custom_post_processing.rs
@@ -47,7 +47,7 @@ impl Plugin for PostProcessPlugin {
             // This plugin will take care of extracting it automatically.
             // It's important to derive [`ExtractComponent`] on [`PostProcessSettings`]
             // for this plugin to work correctly.
-            ExtractComponentPlugin::<PostProcessSettings>::default(),
+            ExtractComponentPlugin::<PostProcessSettings>::new(RenderApp),
             // The settings will also be the data used in the shader.
             // This plugin will prepare the component for the GPU by creating a uniform buffer
             // and writing the data to that buffer every frame.
diff --git a/examples/shader_advanced/custom_render_phase.rs b/examples/shader_advanced/custom_render_phase.rs
@@ -57,7 +57,8 @@ use bevy::{
         renderer::{RenderContext, ViewQuery},
         sync_world::MainEntity,
         view::{ExtractedView, RenderVisibleEntities, RetainedViewEntity, ViewTarget},
-        Extract, Render, RenderApp, RenderDebugFlags, RenderStartup, RenderSystems,
+        Extract, ExtractSchedule, Render, RenderApp, RenderDebugFlags, RenderStartup,
+        RenderSystems,
     },
 };
 use indexmap::IndexMap;
@@ -118,7 +119,7 @@ struct MeshStencilPhasePlugin;
 impl Plugin for MeshStencilPhasePlugin {
     fn build(&self, app: &mut App) {
         app.add_plugins((
-            ExtractComponentPlugin::<DrawStencil>::default(),
+            ExtractComponentPlugin::<DrawStencil>::new(RenderApp),
             SortedRenderPhasePlugin::<Stencil3d, MeshPipeline>::new(RenderDebugFlags::default()),
         ));
         // We need to get the render app from the main app
diff --git a/examples/shader_advanced/custom_shader_instancing.rs b/examples/shader_advanced/custom_shader_instancing.rs
@@ -103,7 +103,9 @@ struct CustomMaterialPlugin;
 
 impl Plugin for CustomMaterialPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins(ExtractComponentPlugin::<InstanceMaterialData>::default());
+        app.add_plugins(ExtractComponentPlugin::<InstanceMaterialData>::new(
+            RenderApp,
+        ));
         app.sub_app_mut(RenderApp)
             .add_render_command::<Transparent3d, DrawCustom>()
             .init_resource::<SpecializedMeshPipelines<CustomPipeline>>()
diff --git a/examples/shader_advanced/render_depth_to_texture.rs b/examples/shader_advanced/render_depth_to_texture.rs
@@ -27,7 +27,7 @@ use bevy::{
     prelude::*,
     render::{
         camera::ExtractedCamera,
-        extract_resource::{ExtractResource, ExtractResourcePlugin},
+        extract_resource::{ExtractBaseResource, ExtractResourcePlugin},
         render_asset::RenderAssets,
         render_resource::{
             AsBindGroup, Extent3d, Origin3d, TexelCopyTextureInfo, TextureAspect, TextureDimension,
@@ -103,7 +103,7 @@ fn main() {
 
     app.add_plugins(DefaultPlugins)
         .add_plugins(MaterialPlugin::<ShowDepthTextureMaterial>::default())
-        .add_plugins(ExtractResourcePlugin::<DemoDepthTexture>::default())
+        .add_plugins(ExtractResourcePlugin::<DemoDepthTexture>::new(RenderApp))
         .init_resource::<DemoDepthTexture>()
         .add_systems(Startup, setup)
         .add_systems(Update, rotate_cube)
@@ -332,7 +332,7 @@ impl FromWorld for DemoDepthTexture {
     }
 }
 
-impl ExtractResource for DemoDepthTexture {
+impl ExtractBaseResource<RenderApp> for DemoDepthTexture {
     type Source = Self;
 
     fn extract_resource(source: &Self::Source) -> Self {
diff --git a/examples/shader_advanced/specialized_mesh_pipeline.rs b/examples/shader_advanced/specialized_mesh_pipeline.rs
@@ -103,7 +103,9 @@ fn setup(mut commands: Commands, mut meshes: ResMut<Assets<Mesh>>) {
 struct CustomRenderedMeshPipelinePlugin;
 impl Plugin for CustomRenderedMeshPipelinePlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins(ExtractComponentPlugin::<CustomRenderedEntity>::default());
+        app.add_plugins(ExtractComponentPlugin::<CustomRenderedEntity>::new(
+            RenderApp,
+        ));
 
         // We make sure to add these to the render app, not the main app.
         let Some(render_app) = app.get_sub_app_mut(RenderApp) else {

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,6 @@ impl Plugin for ExtractPlugin {`
`72`	`72`	`extract(main_world, render_world);`
`73`	`73`	`});`
`74`	`74`
`75`		`- let (sender, receiver) = bevy_time::create_time_channels();`
`76`		`- sub_app.insert_resource(sender);`
`77`		`- app.insert_resource(receiver);`
`78`	`75`	`app.insert_sub_app(self.app_label, sub_app);`
`79`	`76`	`}`
`80`	`77`	`}`