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

get_glyph_atlas_info refactor (#17044)

Browse Source 
# Objective

Return a `GlyphAtlasInfo` instead of a tuple from the inner block so we
can remove the outer mapping.
This commit is contained in:
ickshonpe 2024-12-30 21:08:12 +00:00 committed by GitHub
parent c890cc9dc3
commit d2f61e24e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/bevy_text/src/font_atlas_set.rs
View File

@ -179,22 +179,15 @@ impl FontAtlasSet {
self.font_atlases self.font_atlases
.get(&FontAtlasKey(cache_key.font_size_bits, font_smoothing)) .get(&FontAtlasKey(cache_key.font_size_bits, font_smoothing))
.and_then(|font_atlases| { .and_then(|font_atlases| {
font_atlases font_atlases.iter().find_map(|atlas| {
.iter() atlas
.find_map(|atlas| { .get_glyph_index(cache_key)
atlas.get_glyph_index(cache_key).map(|location| { .map(|location| GlyphAtlasInfo {
( location,
location, texture_atlas: atlas.texture_atlas.clone_weak(),
atlas.texture_atlas.clone_weak(), texture: atlas.texture.clone_weak(),
atlas.texture.clone_weak(),
)
}) })
}) })
.map(|(location, texture_atlas, texture)| GlyphAtlasInfo {
texture_atlas,
location,
texture,
})
}) })
} }