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

Fix size of clipped text glyphs. (#8197)

Browse Source 
# Objective

Text glyphs that were clipped were not sized correctly because the
transform extracted from the `extract_text_uinodes` had a scaling on it
that wasn't accounted for.

fixes #8167

## Solution

Remove the scaling from the transform and multiply the size of the
glyphs by the inverse of the scale factor.
This commit is contained in:
ickshonpe 2023-04-05 23:26:52 +01:00 committed by GitHub
parent ff9f2234f3
commit 1a7f046c4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/bevy_ui/src/render/mod.rs
View File

@ -296,7 +296,7 @@ pub fn extract_text_uinodes(
.map(|window| window.resolution.scale_factor() as f32) .map(|window| window.resolution.scale_factor() as f32)
.unwrap_or(1.0); .unwrap_or(1.0);
let scaling = Mat4::from_scale(Vec3::splat(scale_factor.recip())); let inverse_scale_factor = scale_factor.recip();
for (stack_index, entity) in ui_stack.uinodes.iter().enumerate() { for (stack_index, entity) in ui_stack.uinodes.iter().enumerate() {
if let Ok((uinode, global_transform, text, text_layout_info, visibility, clip)) = if let Ok((uinode, global_transform, text, text_layout_info, visibility, clip)) =
@ -306,10 +306,8 @@ pub fn extract_text_uinodes(
if !visibility.is_visible() || uinode.size().x == 0. || uinode.size().y == 0. { if !visibility.is_visible() || uinode.size().x == 0. || uinode.size().y == 0. {
continue; continue;
} }
let transform = global_transform.compute_matrix() let transform = global_transform.compute_matrix()
* Mat4::from_translation(-0.5 * uinode.size().extend(0.)) * Mat4::from_translation(-0.5 * uinode.size().extend(0.));
* scaling;
let mut color = Color::WHITE; let mut color = Color::WHITE;
let mut current_section = usize::MAX; let mut current_section = usize::MAX;
@ -326,13 +324,17 @@ pub fn extract_text_uinodes(
} }
let atlas = texture_atlases.get(&atlas_info.texture_atlas).unwrap(); let atlas = texture_atlases.get(&atlas_info.texture_atlas).unwrap();
let mut rect = atlas.textures[atlas_info.glyph_index];
rect.min *= inverse_scale_factor;
rect.max *= inverse_scale_factor;
extracted_uinodes.uinodes.push(ExtractedUiNode { extracted_uinodes.uinodes.push(ExtractedUiNode {
stack_index, stack_index,
transform: transform * Mat4::from_translation(position.extend(0.)), transform: transform
* Mat4::from_translation(position.extend(0.) * inverse_scale_factor),
color, color,
rect: atlas.textures[atlas_info.glyph_index], rect,
image: atlas.texture.clone_weak(), image: atlas.texture.clone_weak(),
atlas_size: Some(atlas.size), atlas_size: Some(atlas.size * inverse_scale_factor),
clip: clip.map(|clip| clip.clip), clip: clip.map(|clip| clip.clip),
flip_x: false, flip_x: false,
flip_y: false, flip_y: false,