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

Remove the atlas_scaling field from ExtractedUiItem::Gylphs. (#17047)

Browse Source 
# Objective

Remove the `atlas_scaling` field from `ExtractedUiItem::Gylphs`. 

It's only ever set to `Vec2::ONE`. I don't remember why/if this field
was ever needed, maybe it was useful before the scale factor clean up.

## Migration Guide

The `atlas_scaling` field from `ExtractedUiItem::Gylphs` has been
removed. This shouldn't affect any existing code as it wasn't used for
anything.
This commit is contained in:
ickshonpe 2025-01-01 04:06:53 +00:00 committed by GitHub
parent 5f1e762f19
commit 0141bd01b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,6 @@ pub enum ExtractedUiItem {
}, },
/// A contiguous sequence of text glyphs from the same section /// A contiguous sequence of text glyphs from the same section
Glyphs { Glyphs {
atlas_scaling: Vec2,
/// Indices into [`ExtractedUiNodes::glyphs`] /// Indices into [`ExtractedUiNodes::glyphs`]
range: Range<usize>, range: Range<usize>,
}, },
@ -716,10 +715,7 @@ pub fn extract_text_sections(
clip: clip.map(|clip| clip.clip), clip: clip.map(|clip| clip.clip),
camera_entity: render_camera_entity.id(), camera_entity: render_camera_entity.id(),
rect, rect,
item: ExtractedUiItem::Glyphs { item: ExtractedUiItem::Glyphs { range: start..end },
atlas_scaling: Vec2::ONE,
range: start..end,
},
main_entity: entity.into(), main_entity: entity.into(),
}, },
); );
@ -1114,15 +1110,12 @@ pub fn prepare_uinodes(
vertices_index += 6; vertices_index += 6;
indices_index += 4; indices_index += 4;
} }
ExtractedUiItem::Glyphs { ExtractedUiItem::Glyphs { range } => {
atlas_scaling,
range,
} => {
let image = gpu_images let image = gpu_images
.get(extracted_uinode.image) .get(extracted_uinode.image)
.expect("Image was checked during batching and should still exist"); .expect("Image was checked during batching and should still exist");
let atlas_extent = image.size_2d().as_vec2() * *atlas_scaling; let atlas_extent = image.size_2d().as_vec2();
let color = extracted_uinode.color.to_f32_array(); let color = extracted_uinode.color.to_f32_array();
for glyph in &extracted_uinodes.glyphs[range.clone()] { for glyph in &extracted_uinodes.glyphs[range.clone()] {