# Objective Fixes #6642 In a way that doesn't create any breaking changes, as a possible way to fix the above in a patch release. ## Solution Don't actually remove font atlases when `max_font_atlases` is exceeded. Add a warning instead. Keep `TextError::ExceedMaxTextAtlases` and `TextSettings` as-is so we don't break anything. This is a bit of a cop-out, but the problems revealed by #6642 seem very challenging to fix properly. Maybe follow up later with something more like https://github.com/rparrett/bevy/commits/remove-max-font-atlases later, if this is the direction we want to go. ## Note See previous attempt at a "simple fix" that only solved some of the issues: #6666
140 lines
4.4 KiB
Rust
140 lines
4.4 KiB
Rust
use crate::{error::TextError, Font, FontAtlas};
|
|
use ab_glyph::{GlyphId, OutlinedGlyph, Point};
|
|
use bevy_asset::{Assets, Handle};
|
|
use bevy_math::Vec2;
|
|
use bevy_reflect::TypeUuid;
|
|
use bevy_render::texture::Image;
|
|
use bevy_sprite::TextureAtlas;
|
|
use bevy_utils::FloatOrd;
|
|
use bevy_utils::HashMap;
|
|
|
|
type FontSizeKey = FloatOrd;
|
|
|
|
#[derive(TypeUuid)]
|
|
#[uuid = "73ba778b-b6b5-4f45-982d-d21b6b86ace2"]
|
|
pub struct FontAtlasSet {
|
|
font_atlases: HashMap<FontSizeKey, Vec<FontAtlas>>,
|
|
// TODO unused, remove
|
|
#[allow(dead_code)]
|
|
queue: Vec<FontSizeKey>,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct GlyphAtlasInfo {
|
|
pub texture_atlas: Handle<TextureAtlas>,
|
|
pub glyph_index: usize,
|
|
}
|
|
|
|
impl Default for FontAtlasSet {
|
|
fn default() -> Self {
|
|
FontAtlasSet {
|
|
font_atlases: HashMap::with_capacity_and_hasher(1, Default::default()),
|
|
queue: Vec::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl FontAtlasSet {
|
|
pub fn iter(&self) -> impl Iterator<Item = (&FontSizeKey, &Vec<FontAtlas>)> {
|
|
self.font_atlases.iter()
|
|
}
|
|
|
|
pub fn has_glyph(&self, glyph_id: GlyphId, glyph_position: Point, font_size: f32) -> bool {
|
|
self.font_atlases
|
|
.get(&FloatOrd(font_size))
|
|
.map_or(false, |font_atlas| {
|
|
font_atlas
|
|
.iter()
|
|
.any(|atlas| atlas.has_glyph(glyph_id, glyph_position.into()))
|
|
})
|
|
}
|
|
|
|
pub fn add_glyph_to_atlas(
|
|
&mut self,
|
|
texture_atlases: &mut Assets<TextureAtlas>,
|
|
textures: &mut Assets<Image>,
|
|
outlined_glyph: OutlinedGlyph,
|
|
) -> Result<GlyphAtlasInfo, TextError> {
|
|
let glyph = outlined_glyph.glyph();
|
|
let glyph_id = glyph.id;
|
|
let glyph_position = glyph.position;
|
|
let font_size = glyph.scale.y;
|
|
let font_atlases = self
|
|
.font_atlases
|
|
.entry(FloatOrd(font_size))
|
|
.or_insert_with(|| {
|
|
vec![FontAtlas::new(
|
|
textures,
|
|
texture_atlases,
|
|
Vec2::splat(512.0),
|
|
)]
|
|
});
|
|
|
|
let glyph_texture = Font::get_outlined_glyph_texture(outlined_glyph);
|
|
let add_char_to_font_atlas = |atlas: &mut FontAtlas| -> bool {
|
|
atlas.add_glyph(
|
|
textures,
|
|
texture_atlases,
|
|
glyph_id,
|
|
glyph_position.into(),
|
|
&glyph_texture,
|
|
)
|
|
};
|
|
if !font_atlases.iter_mut().any(add_char_to_font_atlas) {
|
|
// Find the largest dimension of the glyph, either its width or its height
|
|
let glyph_max_size: u32 = glyph_texture
|
|
.texture_descriptor
|
|
.size
|
|
.height
|
|
.max(glyph_texture.texture_descriptor.size.width);
|
|
// Pick the higher of 512 or the smallest power of 2 greater than glyph_max_size
|
|
let containing = (1u32 << (32 - glyph_max_size.leading_zeros())).max(512) as f32;
|
|
font_atlases.push(FontAtlas::new(
|
|
textures,
|
|
texture_atlases,
|
|
Vec2::new(containing, containing),
|
|
));
|
|
if !font_atlases.last_mut().unwrap().add_glyph(
|
|
textures,
|
|
texture_atlases,
|
|
glyph_id,
|
|
glyph_position.into(),
|
|
&glyph_texture,
|
|
) {
|
|
return Err(TextError::FailedToAddGlyph(glyph_id));
|
|
}
|
|
}
|
|
|
|
Ok(self
|
|
.get_glyph_atlas_info(font_size, glyph_id, glyph_position)
|
|
.unwrap())
|
|
}
|
|
|
|
pub fn get_glyph_atlas_info(
|
|
&mut self,
|
|
font_size: f32,
|
|
glyph_id: GlyphId,
|
|
position: Point,
|
|
) -> Option<GlyphAtlasInfo> {
|
|
self.font_atlases
|
|
.get(&FloatOrd(font_size))
|
|
.and_then(|font_atlases| {
|
|
font_atlases
|
|
.iter()
|
|
.find_map(|atlas| {
|
|
atlas
|
|
.get_glyph_index(glyph_id, position.into())
|
|
.map(|glyph_index| (glyph_index, atlas.texture_atlas.clone_weak()))
|
|
})
|
|
.map(|(glyph_index, texture_atlas)| GlyphAtlasInfo {
|
|
texture_atlas,
|
|
glyph_index,
|
|
})
|
|
})
|
|
}
|
|
|
|
pub fn num_font_atlases(&self) -> usize {
|
|
self.font_atlases.len()
|
|
}
|
|
}
|