mirror of
https://github.com/bevyengine/bevy
synced 2024-12-27 13:33:08 +00:00
ba09f35474
# Objective - Fixes #11219 ## Solution - Scaling calculations use texture dimensions instead of layout dimensions. ## Testing - Did you test these changes? If so, how? All UI examples look fine. - How can other people (reviewers) test your changes? Is there anything specific they need to know? Example in #11219 ## Migration Guide ```diff let ui_node = ExtractedUiNode { stack_index, transform, color, rect, image, - atlas_size: Some(atlas_size * scale_factor), + atlas_scaling: Some(Vec2::splat(scale_factor)), clip, flip_x, flip_y, camera_entity, border, border_radius, node_type, }, ``` ```diff let computed_slices = ComputedTextureSlices { slices, - image_size, } ```
213 lines
6.8 KiB
Rust
213 lines
6.8 KiB
Rust
// This module is mostly copied and pasted from `bevy_sprite::texture_slice`
|
|
//
|
|
// A more centralized solution should be investigated in the future
|
|
|
|
use bevy_asset::{AssetEvent, Assets};
|
|
use bevy_ecs::prelude::*;
|
|
use bevy_math::{Rect, Vec2};
|
|
use bevy_render::texture::Image;
|
|
use bevy_sprite::{ImageScaleMode, TextureAtlas, TextureAtlasLayout, TextureSlice};
|
|
use bevy_transform::prelude::*;
|
|
use bevy_utils::HashSet;
|
|
|
|
use crate::{CalculatedClip, ExtractedUiNode, Node, NodeType, UiImage};
|
|
|
|
/// Component storing texture slices for image nodes entities with a tiled or sliced [`ImageScaleMode`]
|
|
///
|
|
/// This component is automatically inserted and updated
|
|
#[derive(Debug, Clone, Component)]
|
|
pub struct ComputedTextureSlices {
|
|
slices: Vec<TextureSlice>,
|
|
}
|
|
|
|
impl ComputedTextureSlices {
|
|
/// Computes [`ExtractedUiNode`] iterator from the sprite slices
|
|
///
|
|
/// # Arguments
|
|
///
|
|
/// * `transform` - the sprite entity global transform
|
|
/// * `original_entity` - the sprite entity
|
|
/// * `sprite` - The sprite component
|
|
/// * `handle` - The sprite texture handle
|
|
#[must_use]
|
|
pub(crate) fn extract_ui_nodes<'a>(
|
|
&'a self,
|
|
transform: &'a GlobalTransform,
|
|
node: &'a Node,
|
|
image: &'a UiImage,
|
|
clip: Option<&'a CalculatedClip>,
|
|
camera_entity: Entity,
|
|
) -> impl ExactSizeIterator<Item = ExtractedUiNode> + 'a {
|
|
let mut flip = Vec2::new(1.0, -1.0);
|
|
let [mut flip_x, mut flip_y] = [false; 2];
|
|
if image.flip_x {
|
|
flip.x *= -1.0;
|
|
flip_x = true;
|
|
}
|
|
if image.flip_y {
|
|
flip.y *= -1.0;
|
|
flip_y = true;
|
|
}
|
|
self.slices.iter().map(move |slice| {
|
|
let offset = (slice.offset * flip).extend(0.0);
|
|
let transform = transform.mul_transform(Transform::from_translation(offset));
|
|
let scale = slice.draw_size / slice.texture_rect.size();
|
|
let mut rect = slice.texture_rect;
|
|
rect.min *= scale;
|
|
rect.max *= scale;
|
|
ExtractedUiNode {
|
|
stack_index: node.stack_index,
|
|
color: image.color.into(),
|
|
transform: transform.compute_matrix(),
|
|
rect,
|
|
flip_x,
|
|
flip_y,
|
|
image: image.texture.id(),
|
|
atlas_scaling: Some(scale),
|
|
clip: clip.map(|clip| clip.clip),
|
|
camera_entity,
|
|
border: [0.; 4],
|
|
border_radius: [0.; 4],
|
|
node_type: NodeType::Rect,
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
/// Generates sprite slices for a `sprite` given a `scale_mode`. The slices
|
|
/// will be computed according to the `image_handle` dimensions.
|
|
///
|
|
/// Returns `None` if the image asset is not loaded
|
|
///
|
|
/// # Arguments
|
|
///
|
|
/// * `draw_area` - The size of the drawing area the slices will have to fit into
|
|
/// * `scale_mode` - The image scaling component
|
|
/// * `image_handle` - The texture to slice or tile
|
|
/// * `images` - The image assets, use to retrieve the image dimensions
|
|
/// * `atlas` - Optional texture atlas, if set the slicing will happen on the matching sub section
|
|
/// of the texture
|
|
/// * `atlas_layouts` - The atlas layout assets, used to retrieve the texture atlas section rect
|
|
#[must_use]
|
|
fn compute_texture_slices(
|
|
draw_area: Vec2,
|
|
scale_mode: &ImageScaleMode,
|
|
image_handle: &UiImage,
|
|
images: &Assets<Image>,
|
|
atlas: Option<&TextureAtlas>,
|
|
atlas_layouts: &Assets<TextureAtlasLayout>,
|
|
) -> Option<ComputedTextureSlices> {
|
|
let texture_rect = match atlas {
|
|
Some(a) => {
|
|
let layout = atlas_layouts.get(&a.layout)?;
|
|
layout.textures.get(a.index)?.as_rect()
|
|
}
|
|
None => {
|
|
let image = images.get(&image_handle.texture)?;
|
|
let size = Vec2::new(
|
|
image.texture_descriptor.size.width as f32,
|
|
image.texture_descriptor.size.height as f32,
|
|
);
|
|
Rect {
|
|
min: Vec2::ZERO,
|
|
max: size,
|
|
}
|
|
}
|
|
};
|
|
let slices = match scale_mode {
|
|
ImageScaleMode::Sliced(slicer) => slicer.compute_slices(texture_rect, Some(draw_area)),
|
|
ImageScaleMode::Tiled {
|
|
tile_x,
|
|
tile_y,
|
|
stretch_value,
|
|
} => {
|
|
let slice = TextureSlice {
|
|
texture_rect,
|
|
draw_size: draw_area,
|
|
offset: Vec2::ZERO,
|
|
};
|
|
slice.tiled(*stretch_value, (*tile_x, *tile_y))
|
|
}
|
|
};
|
|
Some(ComputedTextureSlices { slices })
|
|
}
|
|
|
|
/// System reacting to added or modified [`Image`] handles, and recompute sprite slices
|
|
/// on matching sprite entities with a [`ImageScaleMode`] component
|
|
pub(crate) fn compute_slices_on_asset_event(
|
|
mut commands: Commands,
|
|
mut events: EventReader<AssetEvent<Image>>,
|
|
images: Res<Assets<Image>>,
|
|
atlas_layouts: Res<Assets<TextureAtlasLayout>>,
|
|
ui_nodes: Query<(
|
|
Entity,
|
|
&ImageScaleMode,
|
|
&Node,
|
|
&UiImage,
|
|
Option<&TextureAtlas>,
|
|
)>,
|
|
) {
|
|
// We store the asset ids of added/modified image assets
|
|
let added_handles: HashSet<_> = events
|
|
.read()
|
|
.filter_map(|e| match e {
|
|
AssetEvent::Added { id } | AssetEvent::Modified { id } => Some(*id),
|
|
_ => None,
|
|
})
|
|
.collect();
|
|
if added_handles.is_empty() {
|
|
return;
|
|
}
|
|
// We recompute the sprite slices for sprite entities with a matching asset handle id
|
|
for (entity, scale_mode, ui_node, image, atlas) in &ui_nodes {
|
|
if !added_handles.contains(&image.texture.id()) {
|
|
continue;
|
|
}
|
|
if let Some(slices) = compute_texture_slices(
|
|
ui_node.size(),
|
|
scale_mode,
|
|
image,
|
|
&images,
|
|
atlas,
|
|
&atlas_layouts,
|
|
) {
|
|
commands.entity(entity).try_insert(slices);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// System reacting to changes on relevant sprite bundle components to compute the sprite slices
|
|
/// on matching sprite entities with a [`ImageScaleMode`] component
|
|
pub(crate) fn compute_slices_on_image_change(
|
|
mut commands: Commands,
|
|
images: Res<Assets<Image>>,
|
|
atlas_layouts: Res<Assets<TextureAtlasLayout>>,
|
|
changed_nodes: Query<
|
|
(
|
|
Entity,
|
|
&ImageScaleMode,
|
|
&Node,
|
|
&UiImage,
|
|
Option<&TextureAtlas>,
|
|
),
|
|
Or<(
|
|
Changed<ImageScaleMode>,
|
|
Changed<UiImage>,
|
|
Changed<Node>,
|
|
Changed<TextureAtlas>,
|
|
)>,
|
|
>,
|
|
) {
|
|
for (entity, scale_mode, ui_node, image, atlas) in &changed_nodes {
|
|
if let Some(slices) = compute_texture_slices(
|
|
ui_node.size(),
|
|
scale_mode,
|
|
image,
|
|
&images,
|
|
atlas,
|
|
&atlas_layouts,
|
|
) {
|
|
commands.entity(entity).try_insert(slices);
|
|
}
|
|
}
|
|
}
|