feature gate bevy_render and bevy_text

Author: BenjaminBrienen

crates/bevy_image/src/image.rs

@@ -5,7 +5,7 @@ use super::dds::*;
 #[cfg(feature = "ktx2")]
 use super::ktx2::*;
 
-use bevy_asset::{Asset, RenderAssetUsages};
+use bevy_asset::{Asset, Handle, RenderAssetUsages};
 use bevy_color::{Color, ColorToComponents, Gray, LinearRgba, Srgba, Xyza};
 use bevy_math::{AspectRatio, UVec2, UVec3, Vec2};
 use bevy_reflect::std_traits::ReflectDefault;
@@ -282,6 +282,14 @@ impl ImageFormat {
     }
 }
 
+/// A handle to a 1 x 1 transparent white image.
+///
+/// Like [`Handle<Image>::default`], this is a handle to a fallback image asset.
+/// While that handle points to an opaque white 1 x 1 image, this handle points to a transparent 1 x 1 white image.
+// Number randomly selected by fair WolframAlpha query. Totally arbitrary.
+pub const TRANSPARENT_IMAGE_HANDLE: Handle<Image> =
+    Handle::weak_from_u128(154728948001857810431816125397303024160);
+
 #[derive(Asset, Reflect, Debug, Clone)]
 #[reflect(opaque)]
 #[reflect(Default, Debug)]

crates/bevy_render/src/texture/mod.rs

@@ -6,9 +6,13 @@ mod texture_cache;
 pub use crate::render_resource::DefaultImageSampler;
 #[cfg(feature = "basis-universal")]
 use bevy_image::CompressedImageSaver;
+#[cfg(feature = "exr")]
+use bevy_image::ExrTextureLoader;
 #[cfg(feature = "hdr")]
 use bevy_image::HdrTextureLoader;
-use bevy_image::{CompressedImageFormats, Image, ImageLoader, ImageSamplerDescriptor};
+use bevy_image::{
+    CompressedImageFormats, Image, ImageLoader, ImageSamplerDescriptor, TRANSPARENT_IMAGE_HANDLE,
+};
 pub use fallback_image::*;
 pub use gpu_image::*;
 pub use texture_attachment::*;
@@ -21,14 +25,6 @@ use bevy_app::{App, Plugin};
 use bevy_asset::{AssetApp, Assets, Handle};
 use bevy_ecs::prelude::*;
 
-/// A handle to a 1 x 1 transparent white image.
-///
-/// Like [`Handle<Image>::default`], this is a handle to a fallback image asset.
-/// While that handle points to an opaque white 1 x 1 image, this handle points to a transparent 1 x 1 white image.
-// Number randomly selected by fair WolframAlpha query. Totally arbitrary.
-pub const TRANSPARENT_IMAGE_HANDLE: Handle<Image> =
-    Handle::weak_from_u128(154728948001857810431816125397303024160);
-
 // TODO: replace Texture names with Image names?
 /// Adds the [`Image`] as an asset and makes sure that they are extracted and prepared for the GPU.
 pub struct ImagePlugin {
@@ -62,7 +58,7 @@ impl Plugin for ImagePlugin {
     fn build(&self, app: &mut App) {
         #[cfg(feature = "exr")]
         {
-            app.init_asset_loader::<bevy_image::ExrTextureLoader>();
+            app.init_asset_loader::<ExrTextureLoader>();
         }
 
         #[cfg(feature = "hdr")]

crates/bevy_ui/Cargo.toml

@@ -24,9 +24,10 @@ bevy_math = { path = "../bevy_math", version = "0.15.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.15.0-dev", features = [
   "bevy",
 ] }
-bevy_render = { path = "../bevy_render", version = "0.15.0-dev" }
+bevy_render = { path = "../bevy_render", version = "0.15.0-dev", optional = true }
+bevy_animation = { path = "../bevy_animation", version = "0.15.0-dev" }
 bevy_sprite = { path = "../bevy_sprite", version = "0.15.0-dev" }
-bevy_text = { path = "../bevy_text", version = "0.15.0-dev" }
+bevy_text = { path = "../bevy_text", version = "0.15.0-dev", optional = true }
 bevy_picking = { path = "../bevy_picking", version = "0.15.0-dev", optional = true }
 bevy_transform = { path = "../bevy_transform", version = "0.15.0-dev" }
 bevy_window = { path = "../bevy_window", version = "0.15.0-dev" }
@@ -43,7 +44,7 @@ smallvec = "1.11"
 accesskit = "0.17"
 
 [features]
-default = []
+default = ["bevy_ui_picking_backend", "bevy_render", "bevy_text"]
 serialize = ["serde", "smallvec/serde", "bevy_math/serialize"]
 bevy_ui_picking_backend = ["bevy_picking"]
 bevy_ui_debug = []

crates/bevy_ui/src/accessibility.rs

@@ -9,7 +9,7 @@ use bevy_app::{App, Plugin, PostUpdate};
 use bevy_ecs::{
     prelude::{DetectChanges, Entity},
     query::{Changed, Without},
-    schedule::IntoSystemConfigs,
+    schedule::IntoSystemConfigs as _,
     system::{Commands, Query},
     world::Ref,
 };

crates/bevy_ui/src/experimental/ghost_hierarchy.rs

@@ -3,6 +3,7 @@
 use bevy_ecs::{prelude::*, system::SystemParam};
 use bevy_hierarchy::{Children, HierarchyQueryExt, Parent};
 use bevy_reflect::prelude::*;
+#[cfg(feature = "bevy_render")]
 use bevy_render::view::Visibility;
 use bevy_transform::prelude::Transform;
 use core::marker::PhantomData;
@@ -20,7 +21,8 @@ use crate::Node;
 #[derive(Component, Debug, Copy, Clone, Reflect)]
 #[cfg_attr(feature = "ghost_nodes", derive(Default))]
 #[reflect(Component, Debug)]
-#[require(Visibility, Transform)]
+#[cfg_attr(feature = "bevy_render", require(Visibility))]
+#[require(Transform)]
 pub struct GhostNode {
     // This is a workaround to ensure that GhostNode is only constructable when the appropriate feature flag is enabled
     #[reflect(ignore)]

crates/bevy_ui/src/focus.rs

@@ -1,23 +1,24 @@
-use crate::{
-    CalculatedClip, ComputedNode, DefaultUiCamera, ResolvedBorderRadius, TargetCamera, UiStack,
-};
-use bevy_ecs::{
-    change_detection::DetectChangesMut,
-    entity::{Entity, EntityBorrow},
-    prelude::{Component, With},
-    query::QueryData,
-    reflect::ReflectComponent,
-    system::{Local, Query, Res},
-};
-use bevy_input::{mouse::MouseButton, touch::Touches, ButtonInput};
+use crate::{CalculatedClip, ComputedNode};
+use bevy_ecs::{entity::Entity, prelude::Component, query::QueryData, reflect::ReflectComponent};
 use bevy_math::{Rect, Vec2};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
-use bevy_render::{camera::NormalizedRenderTarget, prelude::Camera, view::ViewVisibility};
 use bevy_transform::components::GlobalTransform;
-use bevy_utils::HashMap;
-use bevy_window::{PrimaryWindow, Window};
 
-use smallvec::SmallVec;
+#[cfg(feature = "bevy_render")]
+use {
+    crate::{DefaultUiCamera, ResolvedBorderRadius, TargetCamera, UiStack},
+    bevy_ecs::{
+        change_detection::DetectChangesMut as _,
+        entity::EntityBorrow as _,
+        prelude::With,
+        system::{Local, Query, Res},
+    },
+    bevy_input::{mouse::MouseButton, touch::Touches, ButtonInput},
+    bevy_render::{camera::NormalizedRenderTarget, prelude::Camera, view::ViewVisibility},
+    bevy_utils::HashMap,
+    bevy_window::{PrimaryWindow, Window},
+    smallvec::SmallVec,
+};
 
 #[cfg(feature = "serialize")]
 use bevy_reflect::{ReflectDeserialize, ReflectSerialize};
@@ -126,6 +127,7 @@ impl Default for FocusPolicy {
 
 /// Contains entities whose Interaction should be set to None
 #[derive(Default)]
+#[cfg(feature = "bevy_render")]
 pub struct State {
     entities_to_reset: SmallVec<[Entity; 1]>,
 }
@@ -141,14 +143,17 @@ pub struct NodeQuery {
     relative_cursor_position: Option<&'static mut RelativeCursorPosition>,
     focus_policy: Option<&'static FocusPolicy>,
     calculated_clip: Option<&'static CalculatedClip>,
+    #[cfg(feature = "bevy_render")]
     view_visibility: Option<&'static ViewVisibility>,
+    #[cfg(feature = "bevy_render")]
     target_camera: Option<&'static TargetCamera>,
 }
 
 /// The system that sets Interaction for all UI elements based on the mouse cursor activity
 ///
 /// Entities with a hidden [`ViewVisibility`] are always treated as released.
 #[allow(clippy::too_many_arguments)]
+#[cfg(feature = "bevy_render")]
 pub fn ui_focus_system(
     mut state: Local<State>,
     camera_query: Query<(Entity, &Camera)>,
@@ -349,6 +354,7 @@ pub fn ui_focus_system(
 // the given size and border radius.
 //
 // Matches the sdf function in `ui.wgsl` that is used by the UI renderer to draw rounded rectangles.
+#[cfg(feature = "bevy_render")]
 pub(crate) fn pick_rounded_rect(
     point: Vec2,
     size: Vec2,

crates/bevy_ui/src/layout/mod.rs

@@ -22,9 +22,8 @@ use bevy_window::{PrimaryWindow, Window, WindowScaleFactorChanged};
 use thiserror::Error;
 use ui_surface::UiSurface;
 
-use bevy_text::ComputedTextBlock;
-
-use bevy_text::CosmicFontSystem;
+#[cfg(feature = "bevy_text")]
+use bevy_text::{ComputedTextBlock, CosmicFontSystem};
 
 mod convert;
 pub mod debug;
@@ -126,8 +125,8 @@ pub fn ui_layout_system(
         Option<&ScrollPosition>,
     )>,
 
-    mut buffer_query: Query<&mut ComputedTextBlock>,
-    mut font_system: ResMut<CosmicFontSystem>,
+    #[cfg(feature = "bevy_text")] mut buffer_query: Query<&mut ComputedTextBlock>,
+    #[cfg(feature = "bevy_text")] mut font_system: ResMut<CosmicFontSystem>,
 ) {
     let UiLayoutSystemBuffers {
         interned_root_nodes,
@@ -270,6 +269,7 @@ with UI components as a child of an entity without UI components, your UI layout
             }
         });
 
+    #[cfg(feature = "bevy_text")]
     let text_buffers = &mut buffer_query;
     // clean up removed nodes after syncing children to avoid potential panic (invalid SlotMap key used)
     ui_surface.remove_entities(
@@ -289,8 +289,14 @@ with UI components as a child of an entity without UI components, your UI layout
     for (camera_id, mut camera) in camera_layout_info.drain() {
         let inverse_target_scale_factor = camera.scale_factor.recip();
 
-        ui_surface.compute_camera_layout(camera_id, camera.size, text_buffers, &mut font_system);
-
+        ui_surface.compute_camera_layout(
+            camera_id,
+            camera.size,
+            #[cfg(feature = "bevy_text")]
+            text_buffers,
+            #[cfg(feature = "bevy_text")]
+            &mut font_system,
+        );
         for root in &camera.root_nodes {
             update_uinode_geometry_recursive(
                 &mut commands,
@@ -489,9 +495,8 @@ mod tests {
     };
     use bevy_image::Image;
     use bevy_math::{Rect, UVec2, Vec2};
-    use bevy_render::{
-        camera::{ManualTextureViews, OrthographicProjection},
-        prelude::Camera,
+    use bevy_render::camera::{
+        camera_system, Camera, ManualTextureViews, OrthographicProjection, Viewport,
     };
     use bevy_transform::{
         prelude::GlobalTransform,
@@ -508,6 +513,9 @@ mod tests {
         update::update_target_camera_system, ContentSize, LayoutContext,
     };
 
+    #[cfg(feature = "bevy_text")]
+    use bevy_text::{ComputedTextBlock, CosmicFontSystem, SwashCache, TextPipeline};
+
     // these window dimensions are easy to convert to and from percentage values
     const WINDOW_WIDTH: f32 = 1000.;
     const WINDOW_HEIGHT: f32 = 100.;
@@ -523,13 +531,12 @@ mod tests {
         world.init_resource::<Events<AssetEvent<Image>>>();
         world.init_resource::<Assets<Image>>();
         world.init_resource::<ManualTextureViews>();
-
-        world.init_resource::<bevy_text::TextPipeline>();
-
-        world.init_resource::<bevy_text::CosmicFontSystem>();
-
-        world.init_resource::<bevy_text::SwashCache>();
-
+        #[cfg(feature = "bevy_text")]
+        {
+            world.init_resource::<TextPipeline>();
+            world.init_resource::<CosmicFontSystem>();
+            world.init_resource::<SwashCache>();
+        }
         // spawn a dummy primary window and camera
         world.spawn((
             Window {
@@ -544,7 +551,7 @@ mod tests {
         ui_schedule.add_systems(
             (
                 // UI is driven by calculated camera target info, so we need to run the camera system first
-                bevy_render::camera::camera_system::<OrthographicProjection>,
+                camera_system::<OrthographicProjection>,
                 update_target_camera_system,
                 ApplyDeferred,
                 ui_layout_system,
@@ -919,7 +926,7 @@ mod tests {
                 let viewport_height = primary_window.resolution.physical_height();
                 let physical_position = UVec2::new(viewport_width * camera_index as u32, 0);
                 let physical_size = UVec2::new(viewport_width, viewport_height);
-                camera.viewport = Some(bevy_render::camera::Viewport {
+                camera.viewport = Some(Viewport {
                     physical_position,
                     physical_size,
                     ..default()
@@ -1168,13 +1175,12 @@ mod tests {
         world.init_resource::<Events<AssetEvent<Image>>>();
         world.init_resource::<Assets<Image>>();
         world.init_resource::<ManualTextureViews>();
-
-        world.init_resource::<bevy_text::TextPipeline>();
-
-        world.init_resource::<bevy_text::CosmicFontSystem>();
-
-        world.init_resource::<bevy_text::SwashCache>();
-
+        #[cfg(feature = "bevy_text")]
+        {
+            world.init_resource::<TextPipeline>();
+            world.init_resource::<CosmicFontSystem>();
+            world.init_resource::<SwashCache>();
+        }
         // spawn a dummy primary window and camera
         world.spawn((
             Window {
@@ -1188,7 +1194,7 @@ mod tests {
         ui_schedule.add_systems(
             (
                 // UI is driven by calculated camera target info, so we need to run the camera system first
-                bevy_render::camera::camera_system::<OrthographicProjection>,
+                camera_system::<OrthographicProjection>,
                 update_target_camera_system,
                 ApplyDeferred,
                 ui_layout_system,
@@ -1234,20 +1240,23 @@ mod tests {
         fn test_system(
             params: In<TestSystemParam>,
             mut ui_surface: ResMut<UiSurface>,
-            mut computed_text_block_query: Query<&mut bevy_text::ComputedTextBlock>,
-            mut font_system: ResMut<bevy_text::CosmicFontSystem>,
+            #[cfg(feature = "bevy_text")] mut computed_text_block_query: Query<
+                &mut ComputedTextBlock,
+            >,
+            #[cfg(feature = "bevy_text")] mut font_system: ResMut<CosmicFontSystem>,
         ) {
             ui_surface.upsert_node(
                 &LayoutContext::TEST_CONTEXT,
                 params.root_node_entity,
                 &Node::default(),
                 None,
             );
-
             ui_surface.compute_camera_layout(
                 params.camera_entity,
                 UVec2::new(800, 600),
+                #[cfg(feature = "bevy_text")]
                 &mut computed_text_block_query,
+                #[cfg(feature = "bevy_text")]
                 &mut font_system,
             );
         }