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

Fixed Ui Image slicing (#12047)

Browse Source 
# Objective

Fixes #11944

## Solution

#11600 made an incorrect assumption on what `UiImageSize` does, removing
its usage in slicing fixes the problem
This commit is contained in:
Félix Lescaudey de Maneville 2024-02-23 02:08:32 +01:00 committed by François
parent 4022385f51
commit 0e75d0066e
2 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bevy_sprite/src/sprite.rs
View File

@ -32,6 +32,8 @@ pub struct Sprite {
} }
/// Controls how the image is altered when scaled. /// Controls how the image is altered when scaled.
///
/// Note: This is not yet compatible with texture atlases
#[derive(Component, Debug, Clone, Reflect)] #[derive(Component, Debug, Clone, Reflect)]
#[reflect(Component)] #[reflect(Component)]
pub enum ImageScaleMode { pub enum ImageScaleMode {

35
crates/bevy_ui/src/texture_slice.rs
View File

@ -10,7 +10,7 @@ use bevy_sprite::{ImageScaleMode, TextureSlice};
use bevy_transform::prelude::*; use bevy_transform::prelude::*;
use bevy_utils::HashSet; use bevy_utils::HashSet;
use crate::{widget::UiImageSize, BackgroundColor, CalculatedClip, ExtractedUiNode, Node, UiImage}; use crate::{BackgroundColor, CalculatedClip, ExtractedUiNode, Node, UiImage};
/// Component storing texture slices for image nodes entities with a tiled or sliced [`ImageScaleMode`] /// Component storing texture slices for image nodes entities with a tiled or sliced [`ImageScaleMode`]
/// ///
@ -119,13 +119,7 @@ pub(crate) fn compute_slices_on_asset_event(
mut commands: Commands, mut commands: Commands,
mut events: EventReader<AssetEvent<Image>>, mut events: EventReader<AssetEvent<Image>>,
images: Res<Assets<Image>>, images: Res<Assets<Image>>,
ui_nodes: Query<( ui_nodes: Query<(Entity, &ImageScaleMode, &Node, &UiImage)>,
Entity,
&ImageScaleMode,
&Node,
Option<&UiImageSize>,
&UiImage,
)>,
) { ) {
// We store the asset ids of added/modified image assets // We store the asset ids of added/modified image assets
let added_handles: HashSet<_> = events let added_handles: HashSet<_> = events
@ -139,12 +133,11 @@ pub(crate) fn compute_slices_on_asset_event(
return; return;
} }
// We recompute the sprite slices for sprite entities with a matching asset handle id // We recompute the sprite slices for sprite entities with a matching asset handle id
for (entity, scale_mode, ui_node, size, image) in &ui_nodes { for (entity, scale_mode, ui_node, image) in &ui_nodes {
if !added_handles.contains(&image.texture.id()) { if !added_handles.contains(&image.texture.id()) {
continue; continue;
} }
let size = size.map(|s| s.size()).unwrap_or(ui_node.size()); if let Some(slices) = compute_texture_slices(ui_node.size(), scale_mode, image, &images) {
if let Some(slices) = compute_texture_slices(size, scale_mode, image, &images) {
commands.entity(entity).insert(slices); commands.entity(entity).insert(slices);
} }
} }
@ -156,24 +149,12 @@ pub(crate) fn compute_slices_on_image_change(
mut commands: Commands, mut commands: Commands,
images: Res<Assets<Image>>, images: Res<Assets<Image>>,
changed_nodes: Query< changed_nodes: Query<
( (Entity, &ImageScaleMode, &Node, &UiImage),
Entity, Or<(Changed<ImageScaleMode>, Changed<UiImage>, Changed<Node>)>,
&ImageScaleMode,
&Node,
Option<&UiImageSize>,
&UiImage,
),
Or<(
Changed<ImageScaleMode>,
Changed<UiImage>,
Changed<UiImageSize>,
Changed<Node>,
)>,
>, >,
) { ) {
for (entity, scale_mode, ui_node, size, image) in &changed_nodes { for (entity, scale_mode, ui_node, image) in &changed_nodes {
let size = size.map(|s| s.size()).unwrap_or(ui_node.size()); if let Some(slices) = compute_texture_slices(ui_node.size(), scale_mode, image, &images) {
if let Some(slices) = compute_texture_slices(size, scale_mode, image, &images) {
commands.entity(entity).insert(slices); commands.entity(entity).insert(slices);
} }
} }