bevy_extract

Author: Zeophlite

Cargo.toml

@@ -315,6 +315,9 @@ bevy_post_process = ["bevy_internal/bevy_post_process"]
 # Provides various anti aliasing solutions
 bevy_anti_alias = ["bevy_internal/bevy_anti_alias"]
 
+# Adds extract
+bevy_extract = ["bevy_internal/bevy_extract"]
+
 # Adds gamepad support
 bevy_gilrs = ["gamepad", "bevy_internal/bevy_gilrs"]
 

crates/bevy_anti_alias/Cargo.toml

@@ -22,6 +22,7 @@ bevy_asset = { path = "../bevy_asset", version = "0.19.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.19.0-dev" }
 bevy_render = { path = "../bevy_render", version = "0.19.0-dev" }
 bevy_camera = { path = "../bevy_camera", version = "0.19.0-dev" }
+bevy_extract = { path = "../bevy_extract", version = "0.19.0-dev" }
 bevy_math = { path = "../bevy_math", version = "0.19.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.19.0-dev" }
 bevy_app = { path = "../bevy_app", version = "0.19.0-dev" }

crates/bevy_anti_alias/src/contrast_adaptive_sharpening/mod.rs

@@ -7,18 +7,22 @@ use bevy_core_pipeline::{
     FullscreenShader,
 };
 use bevy_ecs::{prelude::*, query::QueryItem};
+use bevy_extract::{
+    extract_component::{ExtractComponent, ExtractComponentPlugin},
+    sync_component::SyncComponent,
+    Render, RenderApp, RenderSystems,
+};
 use bevy_image::BevyDefault as _;
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::{
-    extract_component::{ExtractComponent, ExtractComponentPlugin, UniformComponentPlugin},
+    extract_component::UniformComponentPlugin,
     render_resource::{
         binding_types::{sampler, texture_2d, uniform_buffer},
         *,
     },
     renderer::RenderDevice,
-    sync_component::SyncComponent,
     view::{ExtractedView, ViewTarget},
-    Render, RenderApp, RenderStartup, RenderSystems,
+    RenderStartup,
 };
 
 mod node;

crates/bevy_anti_alias/src/contrast_adaptive_sharpening/node.rs

@@ -1,8 +1,9 @@
 use crate::contrast_adaptive_sharpening::ViewCasPipeline;
 use bevy_ecs::prelude::*;
+use bevy_extract::extract_component::DynamicUniformIndex;
 use bevy_render::{
     diagnostic::RecordDiagnostics,
-    extract_component::{ComponentUniforms, DynamicUniformIndex},
+    extract_component::ComponentUniforms,
     render_resource::{
         BindGroup, BindGroupEntries, BufferId, Operations, PipelineCache,
         RenderPassColorAttachment, RenderPassDescriptor, TextureViewId,

crates/bevy_anti_alias/src/fxaa/mod.rs

@@ -7,17 +7,20 @@ use bevy_core_pipeline::{
     FullscreenShader,
 };
 use bevy_ecs::prelude::*;
+use bevy_extract::{
+    extract_component::{ExtractComponent, ExtractComponentPlugin},
+    Render, RenderApp, RenderSystems,
+};
 use bevy_image::BevyDefault as _;
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::{
-    extract_component::{ExtractComponent, ExtractComponentPlugin},
     render_resource::{
         binding_types::{sampler, texture_2d},
         *,
     },
     renderer::RenderDevice,
     view::{ExtractedView, ViewTarget},
-    Render, RenderApp, RenderStartup, RenderSystems,
+    RenderStartup,
 };
 use bevy_shader::Shader;
 use bevy_utils::default;

crates/bevy_anti_alias/src/smaa/mod.rs

@@ -47,13 +47,16 @@ use bevy_ecs::{
     schedule::IntoScheduleConfigs as _,
     system::{Commands, Query, Res, ResMut},
 };
+use bevy_extract::{
+    extract_component::{ExtractComponent, ExtractComponentPlugin},
+    Render, RenderApp, RenderSystems,
+};
 use bevy_image::{BevyDefault, Image, ToExtents};
 use bevy_math::{vec4, Vec4};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::{
     camera::ExtractedCamera,
     diagnostic::RecordDiagnostics,
-    extract_component::{ExtractComponent, ExtractComponentPlugin},
     render_asset::RenderAssets,
     render_resource::{
         binding_types::{sampler, texture_2d, uniform_buffer},
@@ -70,7 +73,7 @@ use bevy_render::{
     renderer::{RenderContext, RenderDevice, RenderQueue, ViewQuery},
     texture::{CachedTexture, GpuImage, TextureCache},
     view::{ExtractedView, ViewTarget},
-    Render, RenderApp, RenderStartup, RenderSystems,
+    RenderStartup,
 };
 use bevy_shader::{Shader, ShaderDefVal};
 use bevy_utils::prelude::default;

crates/bevy_anti_alias/src/taa/mod.rs

@@ -15,6 +15,11 @@ use bevy_ecs::{
     schedule::IntoScheduleConfigs,
     system::{Commands, Query, Res, ResMut},
 };
+use bevy_extract::{
+    sync_component::{SyncComponent, SyncComponentPlugin},
+    sync_world::RenderEntity,
+    ExtractSchedule, MainWorld, Render, RenderApp, RenderSystems,
+};
 use bevy_image::{BevyDefault as _, ToExtents};
 use bevy_math::vec2;
 use bevy_post_process::{bloom::bloom, motion_blur::motion_blur};
@@ -32,11 +37,9 @@ use bevy_render::{
         TextureFormat, TextureSampleType, TextureUsages, Variants,
     },
     renderer::{RenderContext, RenderDevice, ViewQuery},
-    sync_component::{SyncComponent, SyncComponentPlugin},
-    sync_world::RenderEntity,
     texture::{CachedTexture, TextureCache},
     view::{ExtractedView, Msaa, ViewTarget},
-    ExtractSchedule, MainWorld, Render, RenderApp, RenderStartup, RenderSystems,
+    RenderStartup,
 };
 use bevy_utils::default;
 use tracing::warn;

crates/bevy_core_pipeline/Cargo.toml

@@ -22,6 +22,7 @@ bevy_color = { path = "../bevy_color", version = "0.19.0-dev" }
 bevy_derive = { path = "../bevy_derive", version = "0.19.0-dev" }
 bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.19.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.19.0-dev" }
+bevy_extract = { path = "../bevy_extract", version = "0.19.0-dev" }
 bevy_image = { path = "../bevy_image", version = "0.19.0-dev" }
 bevy_log = { path = "../bevy_log", version = "0.19.0-dev" }
 bevy_light = { path = "../bevy_light", version = "0.19.0-dev" }

crates/bevy_core_pipeline/src/blit/mod.rs

@@ -2,13 +2,14 @@ use crate::FullscreenShader;
 use bevy_app::{App, Plugin};
 use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer, Handle};
 use bevy_ecs::prelude::*;
+use bevy_extract::RenderApp;
 use bevy_render::{
     render_resource::{
         binding_types::{sampler, texture_2d},
         *,
     },
     renderer::RenderDevice,
-    RenderApp, RenderStartup,
+    RenderStartup,
 };
 use bevy_shader::Shader;
 use bevy_utils::default;

crates/bevy_core_pipeline/src/core_2d/mod.rs

@@ -9,7 +9,7 @@ use bevy_image::ToExtents;
 use bevy_platform::collections::{HashMap, HashSet};
 use bevy_render::{
     batching::gpu_preprocessing::GpuPreprocessingMode,
-    camera::CameraRenderGraph,
+    camera::{CameraPlugin, CameraRenderGraph},
     render_phase::PhaseItemBatchSetKey,
     view::{ExtractedView, RetainedViewEntity},
 };
@@ -22,10 +22,13 @@ use crate::upscaling::upscaling;
 use crate::Core2dSystems;
 use bevy_app::{App, Plugin};
 use bevy_ecs::prelude::*;
+use bevy_extract::{
+    extract_component::ExtractComponentPlugin, sync_world::MainEntity, Extract, ExtractSchedule,
+    Render, RenderApp, RenderSystems,
+};
 use bevy_math::FloatOrd;
 use bevy_render::{
     camera::ExtractedCamera,
-    extract_component::ExtractComponentPlugin,
     render_phase::{
         sort_phase_system, BinnedPhaseItem, CachedRenderPipelinePhaseItem, DrawFunctionId,
         DrawFunctions, PhaseItem, PhaseItemExtraIndex, SortedPhaseItem, ViewBinnedRenderPhases,
@@ -36,10 +39,8 @@ use bevy_render::{
         TextureUsages,
     },
     renderer::RenderDevice,
-    sync_world::MainEntity,
     texture::TextureCache,
     view::{Msaa, ViewDepthTexture},
-    Extract, ExtractSchedule, Render, RenderApp, RenderSystems,
 };
 
 pub const CORE_2D_DEPTH_FORMAT: TextureFormat = TextureFormat::Depth32Float;
@@ -53,7 +54,7 @@ impl Plugin for Core2dPlugin {
                 CameraRenderGraph::new(Core2d)
             })
             .register_required_components_with::<Camera2d, Tonemapping>(|| Tonemapping::None)
-            .add_plugins(ExtractComponentPlugin::<Camera2d>::default());
+            .add_plugins(ExtractComponentPlugin::<Camera2d, CameraPlugin>::default());
 
         let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
             return;