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.

Sign up for GitHub

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

Jump to bottom

[Merged by Bors] - create font atlas that can contains fonts of any size #3592

Closed
wants to merge 4 commits into from
Closed

[Merged by Bors] - create font atlas that can contains fonts of any size #3592

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e848e6
create font atlas that can contains fonts of any size
mockersf Jan 8, 2022
56a560c
:paperclip:
mockersf Jan 8, 2022
374735d
comments
mockersf Jun 1, 2022
600f41d
improve comment
mockersf Jun 1, 2022
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
10 changes: 9 additions & 1 deletion crates/bevy_text/src/font_atlas_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,18 @@ impl FontAtlasSet {
)
};
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 smaller 2^n value greather than glyph_max_size, and at least 512
mockersf marked this conversation as resolved.
Show resolved Hide resolved
let containing = (1u32 << (32 - glyph_max_size.leading_zeros())).max(512) as f32;
mockersf marked this conversation as resolved.
Show resolved Hide resolved
font_atlases.push(FontAtlas::new(
textures,
texture_atlases,
Vec2::new(512.0, 512.0),
Vec2::new(containing, containing),
));
if !font_atlases.last_mut().unwrap().add_glyph(
textures,
Expand Down