forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow access to font atlases (#18851)

Browse Source 
# Objective
It's not possible atm for third-party crates to create their own text
systems that use the existing cosmic-text `FontSystem` and font atlases.

## Solution
Make `FontFaceInfo`, `TextPipeline::map_handle_to_font_id`, and
`load_font_fontdb` public so third-party crates can access and update
the existing font atlases
This commit is contained in:
ickshonpe 2025-05-26 16:22:56 +01:00 committed by GitHub
parent 3edacb5e46
commit c8872c7665
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/bevy_text/src/pipeline.rs
View File

@ -53,11 +53,15 @@ impl Default for SwashCache {
/// Information about a font collected as part of preparing for text layout. /// Information about a font collected as part of preparing for text layout.
#[derive(Clone)] #[derive(Clone)]
struct FontFaceInfo { pub struct FontFaceInfo {
stretch: cosmic_text::fontdb::Stretch, /// Width class: <https://docs.microsoft.com/en-us/typography/opentype/spec/os2#uswidthclass>
style: cosmic_text::fontdb::Style, pub stretch: cosmic_text::fontdb::Stretch,
weight: cosmic_text::fontdb::Weight, /// Allows italic or oblique faces to be selected
family_name: Arc<str>, pub style: cosmic_text::fontdb::Style,
/// The degree of blackness or stroke thickness
pub weight: cosmic_text::fontdb::Weight,
/// Font family name
pub family_name: Arc<str>,
} }
/// The `TextPipeline` is used to layout and render text blocks (see `Text`/[`Text2d`](crate::Text2d)). /// The `TextPipeline` is used to layout and render text blocks (see `Text`/[`Text2d`](crate::Text2d)).
@ -66,7 +70,7 @@ struct FontFaceInfo {
#[derive(Default, Resource)] #[derive(Default, Resource)]
pub struct TextPipeline { pub struct TextPipeline {
/// Identifies a font [`ID`](cosmic_text::fontdb::ID) by its [`Font`] [`Asset`](bevy_asset::Asset). /// Identifies a font [`ID`](cosmic_text::fontdb::ID) by its [`Font`] [`Asset`](bevy_asset::Asset).
map_handle_to_font_id: HashMap<AssetId<Font>, (cosmic_text::fontdb::ID, Arc<str>)>, pub map_handle_to_font_id: HashMap<AssetId<Font>, (cosmic_text::fontdb::ID, Arc<str>)>,
/// Buffered vec for collecting spans. /// Buffered vec for collecting spans.
/// ///
/// See [this dark magic](https://users.rust-lang.org/t/how-to-cache-a-vectors-capacity/94478/10). /// See [this dark magic](https://users.rust-lang.org/t/how-to-cache-a-vectors-capacity/94478/10).
@ -484,7 +488,8 @@ impl TextMeasureInfo {
} }
} }
fn load_font_to_fontdb( /// Add the font to the cosmic text's `FontSystem`'s in-memory font database
pub fn load_font_to_fontdb(
text_font: &TextFont, text_font: &TextFont,
font_system: &mut cosmic_text::FontSystem, font_system: &mut cosmic_text::FontSystem,
map_handle_to_font_id: &mut HashMap<AssetId<Font>, (cosmic_text::fontdb::ID, Arc<str>)>, map_handle_to_font_id: &mut HashMap<AssetId<Font>, (cosmic_text::fontdb::ID, Arc<str>)>,