update cosmic-text to 0.10.0

Author: TotalKrill

crates/bevy_text/Cargo.toml

@@ -26,7 +26,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
 
 # other
 anyhow = "1.0.4"
-cosmic-text = "0.8.0"
+cosmic-text = "0.10.0"
 thiserror = "1.0"
 serde = {version = "1", features = ["derive"]}
 sys-locale = "0.3.0"

crates/bevy_text/src/font_atlas_set.rs

@@ -93,9 +93,11 @@ impl FontAtlasSet {
         swash_cache: &mut cosmic_text::SwashCache,
         layout_glyph: &cosmic_text::LayoutGlyph,
     ) -> Result<GlyphAtlasInfo, TextError> {
+        let physical_glyph = layout_glyph.physical((0., 0.), 1.0);
+
         let font_atlases = self
             .font_atlases
-            .entry(layout_glyph.cache_key.font_size_bits)
+            .entry(physical_glyph.cache_key.font_size_bits)
             .or_insert_with(|| {
                 vec![FontAtlas::new(
                     textures,
@@ -105,12 +107,12 @@ impl FontAtlasSet {
             });
 
         let (glyph_texture, offset) =
-            Self::get_outlined_glyph_texture(font_system, swash_cache, layout_glyph);
+            Self::get_outlined_glyph_texture(font_system, swash_cache, &physical_glyph);
         let add_char_to_font_atlas = |atlas: &mut FontAtlas| -> bool {
             atlas.add_glyph(
                 textures,
                 texture_atlases,
-                layout_glyph.cache_key,
+                physical_glyph.cache_key,
                 &glyph_texture,
                 offset,
             )
@@ -132,15 +134,17 @@ impl FontAtlasSet {
             if !font_atlases.last_mut().unwrap().add_glyph(
                 textures,
                 texture_atlases,
-                layout_glyph.cache_key,
+                physical_glyph.cache_key,
                 &glyph_texture,
                 offset,
             ) {
-                return Err(TextError::FailedToAddGlyph(layout_glyph.cache_key.glyph_id));
+                return Err(TextError::FailedToAddGlyph(
+                    physical_glyph.cache_key.glyph_id,
+                ));
             }
         }
 
-        Ok(self.get_glyph_atlas_info(layout_glyph.cache_key).unwrap())
+        Ok(self.get_glyph_atlas_info(physical_glyph.cache_key).unwrap())
     }
 
     pub fn get_glyph_atlas_info(
@@ -173,10 +177,10 @@ impl FontAtlasSet {
     pub fn get_outlined_glyph_texture(
         font_system: &mut cosmic_text::FontSystem,
         swash_cache: &mut cosmic_text::SwashCache,
-        layout_glyph: &cosmic_text::LayoutGlyph,
+        physical_glyph: &cosmic_text::PhysicalGlyph,
     ) -> (Image, IVec2) {
         let image = swash_cache
-            .get_image_uncached(font_system, layout_glyph.cache_key)
+            .get_image_uncached(font_system, physical_glyph.cache_key)
             // TODO: don't unwrap
             .unwrap();
 

crates/bevy_text/src/pipeline.rs

@@ -196,12 +196,20 @@ impl TextPipeline {
                     let prev_attrs_list =
                         std::mem::replace(&mut attrs_list, AttrsList::new(Attrs::new()));
                     let prev_line_string = std::mem::take(&mut line_string);
-                    buffer
-                        .lines
-                        .push(BufferLine::new(prev_line_string, prev_attrs_list));
+                    //TODO: is basic the correct way?
+                    buffer.lines.push(BufferLine::new(
+                        prev_line_string,
+                        prev_attrs_list,
+                        cosmic_text::Shaping::Basic,
+                    ));
                 } else {
                     // finalize the final line
-                    buffer.lines.push(BufferLine::new(line_string, attrs_list));
+                    //TODO: is basic the correct way?
+                    buffer.lines.push(BufferLine::new(
+                        line_string,
+                        attrs_list,
+                        cosmic_text::Shaping::Basic,
+                    ));
                     break;
                 }
             }
@@ -304,8 +312,10 @@ impl TextPipeline {
                     }
                 };
 
+                let physical_glyph = layout_glyph.physical((0.,0.),1. );
+
                 let atlas_info = font_atlas_set
-                    .get_glyph_atlas_info(layout_glyph.cache_key)
+                    .get_glyph_atlas_info(physical_glyph.cache_key)
                     .map(Ok)
                     .unwrap_or_else(|| {
                         font_atlas_set.add_glyph_to_atlas(texture_atlases, textures, font_system, swash_cache, layout_glyph)
@@ -327,8 +337,8 @@ impl TextPipeline {
                 let glyph_size = Vec2::new(glyph_rect.width(), glyph_rect.height());
 
                 // offset by half the size because the origin is center
-                let x = glyph_size.x / 2.0 + left + layout_glyph.x_int as f32;
-                let y = line_y + layout_glyph.y_int as f32 - top + glyph_size.y / 2.0;
+                let x = glyph_size.x / 2.0 + left + physical_glyph.x as f32;
+                let y = line_y + physical_glyph.y as f32 - top + glyph_size.y / 2.0;
                 // TODO: use cosmic text's implementation (per-BufferLine alignment) as it will be editor aware
                 // see https://github.com/pop-os/cosmic-text/issues/130 (currently bugged)
                 let x = x + match text_alignment {