 135c7240f1
			
		
	
	
		135c7240f1
		
			
		
	
	
	
	
		
			
			# Objective > Old MR: #5072 > ~~Associated UI MR: #5070~~ > Adresses #1618 Unify sprite management ## Solution - Remove the `Handle<Image>` field in `TextureAtlas` which is the main cause for all the boilerplate - Remove the redundant `TextureAtlasSprite` component - Renamed `TextureAtlas` asset to `TextureAtlasLayout` ([suggestion](https://github.com/bevyengine/bevy/pull/5103#discussion_r917281844)) - Add a `TextureAtlas` component, containing the atlas layout handle and the section index The difference between this solution and #5072 is that instead of the `enum` approach is that we can more easily manipulate texture sheets without any breaking changes for classic `SpriteBundle`s (@mockersf [comment](https://github.com/bevyengine/bevy/pull/5072#issuecomment-1165836139)) Also, this approach is more *data oriented* extracting the `Handle<Image>` and avoiding complex texture atlas manipulations to retrieve the texture in both applicative and engine code. With this method, the only difference between a `SpriteBundle` and a `SpriteSheetBundle` is an **additional** component storing the atlas handle and the index. ~~This solution can be applied to `bevy_ui` as well (see #5070).~~ EDIT: I also applied this solution to Bevy UI ## Changelog - (**BREAKING**) Removed `TextureAtlasSprite` - (**BREAKING**) Renamed `TextureAtlas` to `TextureAtlasLayout` - (**BREAKING**) `SpriteSheetBundle`: - Uses a `Sprite` instead of a `TextureAtlasSprite` component - Has a `texture` field containing a `Handle<Image>` like the `SpriteBundle` - Has a new `TextureAtlas` component instead of a `Handle<TextureAtlasLayout>` - (**BREAKING**) `DynamicTextureAtlasBuilder::add_texture` takes an additional `&Handle<Image>` parameter - (**BREAKING**) `TextureAtlasLayout::from_grid` no longer takes a `Handle<Image>` parameter - (**BREAKING**) `TextureAtlasBuilder::finish` now returns a `Result<(TextureAtlasLayout, Handle<Image>), _>` - `bevy_text`: - `GlyphAtlasInfo` stores the texture `Handle<Image>` - `FontAtlas` stores the texture `Handle<Image>` - `bevy_ui`: - (**BREAKING**) Removed `UiAtlasImage` , the atlas bundle is now identical to the `ImageBundle` with an additional `TextureAtlas` ## Migration Guide * Sprites ```diff fn my_system( mut images: ResMut<Assets<Image>>, - mut atlases: ResMut<Assets<TextureAtlas>>, + mut atlases: ResMut<Assets<TextureAtlasLayout>>, asset_server: Res<AssetServer> ) { let texture_handle: asset_server.load("my_texture.png"); - let layout = TextureAtlas::from_grid(texture_handle, Vec2::new(25.0, 25.0), 5, 5, None, None); + let layout = TextureAtlasLayout::from_grid(Vec2::new(25.0, 25.0), 5, 5, None, None); let layout_handle = atlases.add(layout); commands.spawn(SpriteSheetBundle { - sprite: TextureAtlasSprite::new(0), - texture_atlas: atlas_handle, + atlas: TextureAtlas { + layout: layout_handle, + index: 0 + }, + texture: texture_handle, ..Default::default() }); } ``` * UI ```diff fn my_system( mut images: ResMut<Assets<Image>>, - mut atlases: ResMut<Assets<TextureAtlas>>, + mut atlases: ResMut<Assets<TextureAtlasLayout>>, asset_server: Res<AssetServer> ) { let texture_handle: asset_server.load("my_texture.png"); - let layout = TextureAtlas::from_grid(texture_handle, Vec2::new(25.0, 25.0), 5, 5, None, None); + let layout = TextureAtlasLayout::from_grid(Vec2::new(25.0, 25.0), 5, 5, None, None); let layout_handle = atlases.add(layout); commands.spawn(AtlasImageBundle { - texture_atlas_image: UiTextureAtlasImage { - index: 0, - flip_x: false, - flip_y: false, - }, - texture_atlas: atlas_handle, + atlas: TextureAtlas { + layout: layout_handle, + index: 0 + }, + image: UiImage { + texture: texture_handle, + flip_x: false, + flip_y: false, + }, ..Default::default() }); } ``` --------- Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com> Co-authored-by: François <mockersf@gmail.com> Co-authored-by: IceSentry <IceSentry@users.noreply.github.com>
		
			
				
	
	
		
			167 lines
		
	
	
		
			5.9 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			167 lines
		
	
	
		
			5.9 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use bevy_asset::{Asset, AssetId, Assets, Handle};
 | |
| use bevy_ecs::component::Component;
 | |
| use bevy_math::{Rect, Vec2};
 | |
| use bevy_reflect::Reflect;
 | |
| use bevy_render::texture::Image;
 | |
| use bevy_utils::HashMap;
 | |
| 
 | |
| /// Stores a map used to lookup the position of a texture in a [`TextureAtlas`].
 | |
| /// This can be used to either use and look up a specific section of a texture, or animate frame-by-frame as a sprite sheet.
 | |
| ///
 | |
| /// Optionaly it can store a mapping from sub texture handles to the related area index (see
 | |
| /// [`TextureAtlasBuilder`]).
 | |
| ///
 | |
| /// [Example usage animating sprite.](https://github.com/bevyengine/bevy/blob/latest/examples/2d/sprite_sheet.rs)
 | |
| /// [Example usage loading sprite sheet.](https://github.com/bevyengine/bevy/blob/latest/examples/2d/texture_atlas.rs)
 | |
| ///
 | |
| /// [`TextureAtlasBuilder`]: crate::TextureAtlasBuilder
 | |
| #[derive(Asset, Reflect, Debug, Clone)]
 | |
| #[reflect(Debug)]
 | |
| pub struct TextureAtlasLayout {
 | |
|     // TODO: add support to Uniforms derive to write dimensions and sprites to the same buffer
 | |
|     pub size: Vec2,
 | |
|     /// The specific areas of the atlas where each texture can be found
 | |
|     pub textures: Vec<Rect>,
 | |
|     /// Maps from a specific image handle to the index in `textures` where they can be found.
 | |
|     ///
 | |
|     /// This field is set by [`TextureAtlasBuilder`].
 | |
|     ///
 | |
|     /// [`TextureAtlasBuilder`]: crate::TextureAtlasBuilder
 | |
|     pub(crate) texture_handles: Option<HashMap<AssetId<Image>, usize>>,
 | |
| }
 | |
| 
 | |
| /// Component used to draw a specific section of a texture.
 | |
| ///
 | |
| /// It stores a handle to [`TextureAtlasLayout`] and the index of the current section of the atlas.
 | |
| /// The texture atlas contains various *sections* of a given texture, allowing users to have a single
 | |
| /// image file for either sprite animation or global mapping.
 | |
| /// You can change the texture [`index`](Self::index) of the atlas to animate the sprite or dsplay only a *section* of the texture
 | |
| /// for efficient rendering of related game objects.
 | |
| ///
 | |
| /// Check the following examples for usage:
 | |
| /// - [`animated sprite sheet example`](https://github.com/bevyengine/bevy/blob/latest/examples/2d/sprite_sheet.rs)
 | |
| /// - [`texture atlas example`](https://github.com/bevyengine/bevy/blob/latest/examples/2d/texture_atlas.rs)
 | |
| #[derive(Component, Default, Debug, Clone, Reflect)]
 | |
| pub struct TextureAtlas {
 | |
|     /// Texture atlas handle
 | |
|     pub layout: Handle<TextureAtlasLayout>,
 | |
|     /// Texture atlas section index
 | |
|     pub index: usize,
 | |
| }
 | |
| 
 | |
| impl TextureAtlasLayout {
 | |
|     /// Create a new empty layout with custom `dimensions`
 | |
|     pub fn new_empty(dimensions: Vec2) -> Self {
 | |
|         Self {
 | |
|             size: dimensions,
 | |
|             texture_handles: None,
 | |
|             textures: Vec::new(),
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     /// Generate a [`TextureAtlasLayout`] as a grid where each
 | |
|     /// `tile_size` by `tile_size` grid-cell is one of the *section* in the
 | |
|     /// atlas. Grid cells are separated by some `padding`, and the grid starts
 | |
|     /// at `offset` pixels from the top left corner. Resulting layout is
 | |
|     /// indexed left to right, top to bottom.
 | |
|     ///
 | |
|     /// # Arguments
 | |
|     ///
 | |
|     /// * `tile_size` - Each layout grid cell size
 | |
|     /// * `columns` - Grid column count
 | |
|     /// * `rows` - Grid row count
 | |
|     /// * `padding` - Optional padding between cells
 | |
|     /// * `offset` - Optional global grid offset
 | |
|     pub fn from_grid(
 | |
|         tile_size: Vec2,
 | |
|         columns: usize,
 | |
|         rows: usize,
 | |
|         padding: Option<Vec2>,
 | |
|         offset: Option<Vec2>,
 | |
|     ) -> Self {
 | |
|         let padding = padding.unwrap_or_default();
 | |
|         let offset = offset.unwrap_or_default();
 | |
|         let mut sprites = Vec::new();
 | |
|         let mut current_padding = Vec2::ZERO;
 | |
| 
 | |
|         for y in 0..rows {
 | |
|             if y > 0 {
 | |
|                 current_padding.y = padding.y;
 | |
|             }
 | |
|             for x in 0..columns {
 | |
|                 if x > 0 {
 | |
|                     current_padding.x = padding.x;
 | |
|                 }
 | |
| 
 | |
|                 let cell = Vec2::new(x as f32, y as f32);
 | |
| 
 | |
|                 let rect_min = (tile_size + current_padding) * cell + offset;
 | |
| 
 | |
|                 sprites.push(Rect {
 | |
|                     min: rect_min,
 | |
|                     max: rect_min + tile_size,
 | |
|                 });
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         let grid_size = Vec2::new(columns as f32, rows as f32);
 | |
| 
 | |
|         Self {
 | |
|             size: ((tile_size + current_padding) * grid_size) - current_padding,
 | |
|             textures: sprites,
 | |
|             texture_handles: None,
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     /// Add a *section* to the list in the layout and returns its index
 | |
|     /// which can be used with [`TextureAtlas`]
 | |
|     ///
 | |
|     /// # Arguments
 | |
|     ///
 | |
|     /// * `rect` - The section of the texture to be added
 | |
|     ///
 | |
|     /// [`TextureAtlas`]: crate::TextureAtlas
 | |
|     pub fn add_texture(&mut self, rect: Rect) -> usize {
 | |
|         self.textures.push(rect);
 | |
|         self.textures.len() - 1
 | |
|     }
 | |
| 
 | |
|     /// The number of textures in the [`TextureAtlasLayout`]
 | |
|     pub fn len(&self) -> usize {
 | |
|         self.textures.len()
 | |
|     }
 | |
| 
 | |
|     pub fn is_empty(&self) -> bool {
 | |
|         self.textures.is_empty()
 | |
|     }
 | |
| 
 | |
|     /// Retrieves the texture *section* index of the given `texture` handle.
 | |
|     ///
 | |
|     /// This requires the layout to have been built using a [`TextureAtlasBuilder`]
 | |
|     ///
 | |
|     /// [`TextureAtlasBuilder`]: crate::TextureAtlasBuilder
 | |
|     pub fn get_texture_index(&self, texture: impl Into<AssetId<Image>>) -> Option<usize> {
 | |
|         let id = texture.into();
 | |
|         self.texture_handles
 | |
|             .as_ref()
 | |
|             .and_then(|texture_handles| texture_handles.get(&id).cloned())
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl TextureAtlas {
 | |
|     /// Retrieves the current texture [`Rect`] of the sprite sheet according to the section `index`
 | |
|     pub fn texture_rect(&self, texture_atlases: &Assets<TextureAtlasLayout>) -> Option<Rect> {
 | |
|         let atlas = texture_atlases.get(&self.layout)?;
 | |
|         atlas.textures.get(self.index).copied()
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl From<Handle<TextureAtlasLayout>> for TextureAtlas {
 | |
|     fn from(texture_atlas: Handle<TextureAtlasLayout>) -> Self {
 | |
|         Self {
 | |
|             layout: texture_atlas,
 | |
|             index: 0,
 | |
|         }
 | |
|     }
 | |
| }
 |