crates compile

Author: UkoeHB

crates/bevy_text/Cargo.toml

@@ -18,6 +18,7 @@ bevy_asset = { path = "../bevy_asset", version = "0.15.0-dev" }
 bevy_color = { path = "../bevy_color", version = "0.15.0-dev" }
 bevy_derive = { path = "../bevy_derive", version = "0.15.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.15.0-dev" }
+bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.15.0-dev" }
 bevy_math = { path = "../bevy_math", version = "0.15.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.15.0-dev", features = [
   "bevy",
@@ -32,6 +33,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.15.0-dev" }
 cosmic-text = { version = "0.12", features = ["shape-run-cache"] }
 thiserror = "1.0"
 serde = { version = "1", features = ["derive"] }
+smallvec = "1.13"
 unicode-bidi = "0.3.13"
 sys-locale = "0.3.0"
 

crates/bevy_text/src/lib.rs

@@ -43,7 +43,7 @@ mod glyph;
 mod pipeline;
 mod text;
 mod text2d;
-mod text_spans;
+mod text_blocks;
 
 pub use cosmic_text;
 
@@ -57,7 +57,7 @@ pub use glyph::*;
 pub use pipeline::*;
 pub use text::*;
 pub use text2d::*;
-pub use text_spans::*;
+pub use text_blocks::*;
 
 /// The text prelude.
 ///
@@ -106,10 +106,6 @@ pub enum YAxisOrientation {
 #[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
 pub struct Update2dText;
 
-/// A convenient alias for `With<Text>`, for use with
-/// [`bevy_render::view::VisibleEntities`].
-pub type WithText = With<Text>;
-
 impl Plugin for TextPlugin {
     fn build(&self, app: &mut App) {
         app.init_asset::<Font>()

crates/bevy_text/src/pipeline.rs

@@ -16,8 +16,8 @@ use bevy_utils::HashMap;
 use cosmic_text::{Attrs, Buffer, Family, Metrics, Shaping, Wrap};
 
 use crate::{
-    error::TextError, CosmicBuffer, Font, FontAtlasSets, FontSmoothing, JustifyText, LineBreak,
-    PositionedGlyph, TextBounds, TextSection, TextStyle, YAxisOrientation,
+    error::TextError, ComputedTextBlock, Font, FontAtlasSets, FontSmoothing, JustifyText,
+    LineBreak, PositionedGlyph, TextBlock, TextBounds, TextEntity, TextStyle, YAxisOrientation,
 };
 
 /// A wrapper resource around a [`cosmic_text::FontSystem`]
@@ -83,7 +83,7 @@ impl TextPipeline {
     pub fn update_buffer<'a>(
         &mut self,
         fonts: &Assets<Font>,
-        mut text_spans: impl Iterator<Item = (Entity, usize, &'a str, &'a TextStyle)>,
+        text_spans: impl Iterator<Item = (Entity, usize, &'a str, &'a TextStyle)>,
         linebreak: LineBreak,
         justify: JustifyText,
         bounds: TextBounds,
@@ -197,7 +197,7 @@ impl TextPipeline {
     /// Produces a [`TextLayoutInfo`], containing [`PositionedGlyph`]s
     /// which contain information for rendering the text.
     #[allow(clippy::too_many_arguments)]
-    pub fn queue_text(
+    pub fn queue_text<'a>(
         &mut self,
         layout_info: &mut TextLayoutInfo,
         fonts: &Assets<Font>,
@@ -333,7 +333,7 @@ impl TextPipeline {
     /// Produces a [`TextMeasureInfo`] which can be used by a layout system
     /// to measure the text area on demand.
     #[allow(clippy::too_many_arguments)]
-    pub fn create_text_measure(
+    pub fn create_text_measure<'a>(
         &mut self,
         entity: Entity,
         fonts: &Assets<Font>,
@@ -360,6 +360,7 @@ impl TextPipeline {
             font_system,
         )?;
 
+        let buffer = &mut computed.buffer;
         let min_width_content_size = buffer_dimensions(buffer);
 
         let max_width_content_size = {
@@ -414,13 +415,15 @@ impl TextMeasureInfo {
     pub fn compute_size(
         &mut self,
         bounds: TextBounds,
-        buffer: &mut Buffer,
+        computed: &mut ComputedTextBlock,
         font_system: &mut cosmic_text::FontSystem,
     ) -> Vec2 {
         // Note that this arbitrarily adjusts the buffer layout. We assume the buffer is always 'refreshed'
         // whenever a canonical state is required.
-        buffer.set_size(font_system, bounds.width, bounds.height);
-        buffer_dimensions(buffer)
+        computed
+            .buffer
+            .set_size(font_system, bounds.width, bounds.height);
+        buffer_dimensions(&computed.buffer)
     }
 }
 

crates/bevy_text/src/text.rs

@@ -1,13 +1,14 @@
 use bevy_asset::Handle;
 use bevy_color::Color;
 use bevy_derive::{Deref, DerefMut};
-use bevy_ecs::{prelude::Component, reflect::ReflectComponent};
+use bevy_ecs::{prelude::*, reflect::ReflectComponent};
+use bevy_hierarchy::{Children, Parent};
 use bevy_reflect::prelude::*;
-use bevy_utils::default;
 use cosmic_text::{Buffer, Metrics};
 use serde::{Deserialize, Serialize};
+use smallvec::SmallVec;
 
-use crate::Font;
+use crate::{Font, TextLayoutInfo};
 pub use cosmic_text::{
     self, FamilyOwned as FontFamily, Stretch as FontStretch, Style as FontStyle,
     Weight as FontWeight,
@@ -26,8 +27,9 @@ impl Default for CosmicBuffer {
 /// A sub-entity of a [`TextBlock`].
 ///
 /// Returned by [`ComputedTextBlock::entities`].
-#[derive(Default, Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone)]
 pub struct TextEntity {
+    /// The entity.
     pub entity: Entity,
     /// Records the hierarchy depth of the entity within a `TextBlock`.
     pub depth: usize,
@@ -99,7 +101,7 @@ impl Default for ComputedTextBlock {
 /// See [`Text2d`] for the core component of 2d text, and `Text` in `bevy_ui` for UI text.
 #[derive(Component, Debug, Clone, Default, Reflect)]
 #[reflect(Component, Default, Debug)]
-#[requires(ComputedTextBlock, TextLayoutInfo)]
+#[require(ComputedTextBlock, TextLayoutInfo)]
 pub struct TextBlock {
     /// The text's internal alignment.
     /// Should not affect its position within a container.
@@ -125,24 +127,24 @@ impl TextBlock {
     }
 
     /// Makes a new [`TextBlock`] with the specified [`JustifyText`].
-    pub const fn new_with_justify(justify: JustifyText) -> Self {
+    pub fn new_with_justify(justify: JustifyText) -> Self {
         Self::default().with_justify(justify)
     }
 
     /// Makes a new [`TextBlock`] with the specified [`LineBreak`].
-    pub const fn new_with_linebreak(linebreak: LineBreak) -> Self {
+    pub fn new_with_linebreak(linebreak: LineBreak) -> Self {
         Self::default().with_linebreak(linebreak)
     }
 
     /// Makes a new [`TextBlock`] with the specified [`FontSmoothing`].
-    pub const fn new_with_font_smoothing(font_smoothing: FontSmoothing) -> Self {
+    pub fn new_with_font_smoothing(font_smoothing: FontSmoothing) -> Self {
         Self::default().with_font_smoothing(font_smoothing)
     }
 
     /// Makes a new [`TextBlock`] with soft wrapping disabled.
     /// Hard wrapping, where text contains an explicit linebreak such as the escape sequence `\n`, will still occur.
-    pub const fn new_with_no_wrap() -> Self {
-        Self::default().with_no_wrap(linebreak)
+    pub fn new_with_no_wrap() -> Self {
+        Self::default().with_no_wrap()
     }
 
     /// Returns this [`TextBlock`] with the specified [`JustifyText`].
@@ -307,9 +309,11 @@ pub fn detect_text_needs_rerender<Root: Component, Span: Component>(
     >,
     changed_spans: Query<
         &Parent,
-        Or<(Changed<Span>, Changed<TextStyle>, Changed<Children>)>,
-        With<Span>,
-        With<TextStyle>,
+        (
+            Or<(Changed<Span>, Changed<TextStyle>, Changed<Children>)>,
+            With<Span>,
+            With<TextStyle>,
+        ),
     >,
     mut computed: Query<(Option<&Parent>, Option<&mut ComputedTextBlock>)>,
 ) {
@@ -341,7 +345,7 @@ pub fn detect_text_needs_rerender<Root: Component, Span: Component>(
             let Ok((maybe_parent, maybe_computed)) = computed.get_mut(parent) else {
                 break;
             };
-            if let Some(computed) = maybe_computed {
+            if let Some(mut computed) = maybe_computed {
                 computed.needs_rerender = true;
                 break;
             }

crates/bevy_text/src/text2d.rs

@@ -1,28 +1,33 @@
 use crate::pipeline::CosmicFontSystem;
 use crate::{
-    CosmicBuffer, Font, FontAtlasSets, LineBreak, PositionedGlyph, SwashCache, Text, TextBounds,
-    TextError, TextLayoutInfo, TextPipeline, YAxisOrientation,
+    ComputedTextBlock, Font, FontAtlasSets, LineBreak, PositionedGlyph, SwashCache, TextBlock,
+    TextBlocks, TextBounds, TextError, TextLayoutInfo, TextPipeline, TextSpanReader, TextStyle,
+    YAxisOrientation,
 };
 use bevy_asset::Assets;
 use bevy_color::LinearRgba;
+use bevy_derive::{Deref, DerefMut};
+use bevy_ecs::component::Component;
 use bevy_ecs::{
-    bundle::Bundle,
     change_detection::{DetectChanges, Ref},
     entity::Entity,
     event::EventReader,
-    prelude::With,
+    prelude::{ReflectComponent, With},
     query::{Changed, Without},
     system::{Commands, Local, Query, Res, ResMut},
 };
 use bevy_math::Vec2;
+use bevy_reflect::{prelude::ReflectDefault, Reflect};
+use bevy_render::view::Visibility;
 use bevy_render::{
     primitives::Aabb,
     texture::Image,
-    view::{InheritedVisibility, NoFrustumCulling, ViewVisibility, Visibility},
+    view::{NoFrustumCulling, ViewVisibility},
     Extract,
 };
 use bevy_sprite::{Anchor, ExtractedSprite, ExtractedSprites, SpriteSource, TextureAtlasLayout};
-use bevy_transform::prelude::{GlobalTransform, Transform};
+use bevy_transform::components::Transform;
+use bevy_transform::prelude::GlobalTransform;
 use bevy_utils::HashSet;
 use bevy_window::{PrimaryWindow, Window, WindowScaleFactorChanged};
 
@@ -89,6 +94,12 @@ impl Text2d {
     }
 }
 
+impl TextSpanReader for Text2d {
+    fn read_span(&self) -> &str {
+        self.as_str()
+    }
+}
+
 impl From<&str> for Text2d {
     fn from(value: &str) -> Self {
         Self(String::from(value))
@@ -134,9 +145,9 @@ world.spawn((
 ));
 ```
 */
-#[derive(Component, Clone, Debug, Default, Reflect)]
+#[derive(Component, Clone, Debug, Default, Deref, DerefMut, Reflect)]
 #[reflect(Component, Default, Debug)]
-#[require(TextStyle, Visibility = Visibility::Hidden, Transform)]
+#[require(TextStyle, Visibility(visibility_hidden), Transform)]
 pub struct TextSpan2d(pub String);
 
 impl TextSpanReader for TextSpan2d {
@@ -145,6 +156,10 @@ impl TextSpanReader for TextSpan2d {
     }
 }
 
+fn visibility_hidden() -> Visibility {
+    Visibility::Hidden
+}
+
 /// This system extracts the sprites from the 2D text components and adds them to the
 /// "render world".
 pub fn extract_text2d_sprite(
@@ -204,6 +219,7 @@ pub fn extract_text2d_sprite(
                         computed_block
                             .entities()
                             .get(*span_index)
+                            .map(|t| t.entity)
                             .unwrap_or(Entity::PLACEHOLDER),
                     )
                     .map(|style| LinearRgba::from(style.color))
@@ -251,13 +267,12 @@ pub fn update_text2d_layout(
     mut text_pipeline: ResMut<TextPipeline>,
     mut text_query: Query<(
         Entity,
-        Ref<Text2d>,
         Ref<TextBlock>,
         Ref<TextBounds>,
         &mut TextLayoutInfo,
         &mut ComputedTextBlock,
     )>,
-    mut spans: TextSpans<TextSpan2d>,
+    mut blocks: TextBlocks<Text2d, TextSpan2d>,
     mut font_system: ResMut<CosmicFontSystem>,
     mut swash_cache: ResMut<SwashCache>,
 ) {
@@ -272,14 +287,14 @@ pub fn update_text2d_layout(
 
     let inverse_scale_factor = scale_factor.recip();
 
-    for (entity, text, block, bounds, text_layout_info, mut computed) in &mut text_query {
+    for (entity, block, bounds, text_layout_info, mut computed) in &mut text_query {
         if factor_changed
             || computed.needs_rerender()
             || bounds.is_changed()
             || queue.remove(&entity)
         {
             let text_bounds = TextBounds {
-                width: if text.linebreak == LineBreak::NoWrap {
+                width: if block.linebreak == LineBreak::NoWrap {
                     None
                 } else {
                     bounds.width.map(|width| scale_value(width, scale_factor))
@@ -293,9 +308,9 @@ pub fn update_text2d_layout(
             match text_pipeline.queue_text(
                 text_layout_info,
                 &fonts,
-                spans.iter_from_base(entity, text.as_str(), text_style, maybe_children),
+                blocks.iter(entity),
                 scale_factor.into(),
-                block,
+                &block,
                 text_bounds,
                 &mut font_atlas_sets,
                 &mut texture_atlases,