Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix font atlas overflow #495

Merged
merged 4 commits into from
Sep 16, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crates/bevy_text/src/font_atlas.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,16 @@ impl FontAtlas {
texture_atlases: &mut Assets<TextureAtlas>,
character: char,
texture: &Texture,
) {
) -> bool {
let texture_atlas = texture_atlases.get_mut(&self.texture_atlas).unwrap();
if let Some(index) =
self.dynamic_texture_atlas_builder
.add_texture(texture_atlas, textures, texture)
{
self.glyph_to_index.insert(character, index);
true
} else {
panic!("ran out of space in font atlas");
false
}
}
}
54 changes: 44 additions & 10 deletions crates/bevy_text/src/font_atlas_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type FontSizeKey = FloatOrd;
#[derive(Default)]
pub struct FontAtlasSet {
font: Handle<Font>,
font_atlases: HashMap<FontSizeKey, FontAtlas>,
font_atlases: HashMap<FontSizeKey, Vec<FontAtlas>>,
}

#[derive(Debug)]
Expand All @@ -30,15 +30,17 @@ impl FontAtlasSet {
}
}

pub fn iter(&self) -> impl Iterator<Item = (&FontSizeKey, &FontAtlas)> {
pub fn iter(&self) -> impl Iterator<Item = (&FontSizeKey, &Vec<FontAtlas>)> {
self.font_atlases.iter()
}

pub fn has_char(&self, character: char, font_size: f32) -> bool {
self.font_atlases
.get(&FloatOrd(font_size))
.map_or(false, |font_atlas| {
font_atlas.get_char_index(character).is_some()
font_atlas
.iter()
.any(|atlas| atlas.get_char_index(character).is_some())
})
}

Expand All @@ -55,7 +57,13 @@ impl FontAtlasSet {
let font_atlas = self
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: lets rename this font_atlases now that its a vec

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure - makes sense

.font_atlases
.entry(FloatOrd(font_size))
.or_insert_with(|| FontAtlas::new(textures, texture_atlases, Vec2::new(512.0, 512.0)));
.or_insert_with(|| {
vec![FontAtlas::new(
textures,
texture_atlases,
Vec2::new(512.0, 512.0),
)]
});

let mut last_glyph: Option<Glyph> = None;
let mut width = 0.0;
Expand All @@ -67,10 +75,30 @@ impl FontAtlasSet {
if let Some(last_glyph) = last_glyph.take() {
width += scaled_font.kern(last_glyph.id, glyph.id);
}
if font_atlas.get_char_index(character).is_none() {
if !font_atlas
.iter()
.any(|atlas| atlas.get_char_index(character).is_some())
{
if let Some(outlined_glyph) = scaled_font.outline_glyph(glyph.clone()) {
let glyph_texture = Font::get_outlined_glyph_texture(outlined_glyph);
font_atlas.add_char(textures, texture_atlases, character, &glyph_texture);
let add_char_to_fontatlas = |atlas: &mut FontAtlas| -> bool {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: as long as it is, naming conventions dictate that this should be add_char_to_font_atlas :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agreed - although I hate putting it into a Fn ... but clippy complained :-(

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bawhaha yeah sometimes clippy is overly opinionated imo.

atlas.add_char(textures, texture_atlases, character, &glyph_texture)
};
if !font_atlas.iter_mut().any(add_char_to_fontatlas) {
font_atlas.push(FontAtlas::new(
textures,
texture_atlases,
Vec2::new(512.0, 512.0),
));
if !font_atlas.last_mut().unwrap().add_char(
textures,
texture_atlases,
character,
&glyph_texture,
) {
panic!("could not add character to newly created fontatlas");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: lets use type name casing here: FontAtlas

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure thing

}
}
}
}
width += scaled_font.h_advance(glyph.id);
Expand All @@ -84,12 +112,18 @@ impl FontAtlasSet {
self.font_atlases
.get(&FloatOrd(font_size))
verzuz marked this conversation as resolved.
Show resolved Hide resolved
.and_then(|font_atlas| {
font_atlas
.get_char_index(character)
.map(|char_index| GlyphAtlasInfo {
texture_atlas: font_atlas.texture_atlas,
if let Some(atlas) = font_atlas
.iter()
.find(|atlas| atlas.get_char_index(character).is_some())
{
let char_index = atlas.get_char_index(character).unwrap();
Some(GlyphAtlasInfo {
texture_atlas: atlas.texture_atlas,
char_index,
})
} else {
None
}
})
}
}
24 changes: 14 additions & 10 deletions examples/ui/font_atlas_debug.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ fn main() {
}

struct State {
added: bool,
atlas_count: u32,
handle: Handle<Font>,
timer: Timer,
}

impl Default for State {
fn default() -> Self {
Self {
added: false,
atlas_count: 0,
handle: Handle::default(),
timer: Timer::from_seconds(0.05, true),
}
Expand All @@ -34,20 +34,23 @@ fn atlas_render_system(
font_atlas_sets: Res<Assets<FontAtlasSet>>,
texture_atlases: Res<Assets<TextureAtlas>>,
) {
if state.added {
return;
}
if let Some(set) = font_atlas_sets.get(&state.handle.as_handle::<FontAtlasSet>()) {
if let Some((_size, font_atlas)) = set.iter().next() {
state.added = true;
let texture_atlas = texture_atlases.get(&font_atlas.texture_atlas).unwrap();
let x_offset = state.atlas_count as f32;
if state.atlas_count == font_atlas.len() as u32 {
return;
}
let texture_atlas = texture_atlases
.get(&font_atlas[state.atlas_count as usize].texture_atlas)
.unwrap();
state.atlas_count += 1;
commands.spawn(ImageComponents {
material: materials.add(texture_atlas.texture.into()),
style: Style {
position_type: PositionType::Absolute,
position: Rect {
top: Val::Px(0.0),
left: Val::Px(0.0),
left: Val::Px(512.0 * x_offset),
..Default::default()
},
..Default::default()
Expand All @@ -61,8 +64,9 @@ fn atlas_render_system(
fn text_update_system(mut state: ResMut<State>, time: Res<Time>, mut query: Query<&mut Text>) {
for mut text in &mut query.iter() {
state.timer.tick(time.delta_seconds);
if state.timer.finished {
text.value = format!("{}", rand::random::<u8>() as char);
let c = rand::random::<u8>() as char;
if !text.value.contains(c) && state.timer.finished {
text.value = format!("{}{}", text.value, c);
state.timer.reset();
}
}
Expand Down