
# Objective **This implementation is based on https://github.com/bevyengine/rfcs/pull/59.** --- Resolves #4597 Full details and motivation can be found in the RFC, but here's a brief summary. `FromReflect` is a very powerful and important trait within the reflection API. It allows Dynamic types (e.g., `DynamicList`, etc.) to be formed into Real ones (e.g., `Vec<i32>`, etc.). This mainly comes into play concerning deserialization, where the reflection deserializers both return a `Box<dyn Reflect>` that almost always contain one of these Dynamic representations of a Real type. To convert this to our Real type, we need to use `FromReflect`. It also sneaks up in other ways. For example, it's a required bound for `T` in `Vec<T>` so that `Vec<T>` as a whole can be made `FromReflect`. It's also required by all fields of an enum as it's used as part of the `Reflect::apply` implementation. So in other words, much like `GetTypeRegistration` and `Typed`, it is very much a core reflection trait. The problem is that it is not currently treated like a core trait and is not automatically derived alongside `Reflect`. This makes using it a bit cumbersome and easy to forget. ## Solution Automatically derive `FromReflect` when deriving `Reflect`. Users can then choose to opt-out if needed using the `#[reflect(from_reflect = false)]` attribute. ```rust #[derive(Reflect)] struct Foo; #[derive(Reflect)] #[reflect(from_reflect = false)] struct Bar; fn test<T: FromReflect>(value: T) {} test(Foo); // <-- OK test(Bar); // <-- Panic! Bar does not implement trait `FromReflect` ``` #### `ReflectFromReflect` This PR also automatically adds the `ReflectFromReflect` (introduced in #6245) registration to the derived `GetTypeRegistration` impl— if the type hasn't opted out of `FromReflect` of course. <details> <summary><h4>Improved Deserialization</h4></summary> > **Warning** > This section includes changes that have since been descoped from this PR. They will likely be implemented again in a followup PR. I am mainly leaving these details in for archival purposes, as well as for reference when implementing this logic again. And since we can do all the above, we might as well improve deserialization. We can now choose to deserialize into a Dynamic type or automatically convert it using `FromReflect` under the hood. `[Un]TypedReflectDeserializer::new` will now perform the conversion and return the `Box`'d Real type. `[Un]TypedReflectDeserializer::new_dynamic` will work like what we have now and simply return the `Box`'d Dynamic type. ```rust // Returns the Real type let reflect_deserializer = UntypedReflectDeserializer::new(®istry); let mut deserializer = ron:🇩🇪:Deserializer::from_str(input)?; let output: SomeStruct = reflect_deserializer.deserialize(&mut deserializer)?.take()?; // Returns the Dynamic type let reflect_deserializer = UntypedReflectDeserializer::new_dynamic(®istry); let mut deserializer = ron:🇩🇪:Deserializer::from_str(input)?; let output: DynamicStruct = reflect_deserializer.deserialize(&mut deserializer)?.take()?; ``` </details> --- ## Changelog * `FromReflect` is now automatically derived within the `Reflect` derive macro * This includes auto-registering `ReflectFromReflect` in the derived `GetTypeRegistration` impl * ~~Renamed `TypedReflectDeserializer::new` and `UntypedReflectDeserializer::new` to `TypedReflectDeserializer::new_dynamic` and `UntypedReflectDeserializer::new_dynamic`, respectively~~ **Descoped** * ~~Changed `TypedReflectDeserializer::new` and `UntypedReflectDeserializer::new` to automatically convert the deserialized output using `FromReflect`~~ **Descoped** ## Migration Guide * `FromReflect` is now automatically derived within the `Reflect` derive macro. Items with both derives will need to remove the `FromReflect` one. ```rust // OLD #[derive(Reflect, FromReflect)] struct Foo; // NEW #[derive(Reflect)] struct Foo; ``` If using a manual implementation of `FromReflect` and the `Reflect` derive, users will need to opt-out of the automatic implementation. ```rust // OLD #[derive(Reflect)] struct Foo; impl FromReflect for Foo {/* ... */} // NEW #[derive(Reflect)] #[reflect(from_reflect = false)] struct Foo; impl FromReflect for Foo {/* ... */} ``` <details> <summary><h4>Removed Migrations</h4></summary> > **Warning** > This section includes changes that have since been descoped from this PR. They will likely be implemented again in a followup PR. I am mainly leaving these details in for archival purposes, as well as for reference when implementing this logic again. * The reflect deserializers now perform a `FromReflect` conversion internally. The expected output of `TypedReflectDeserializer::new` and `UntypedReflectDeserializer::new` is no longer a Dynamic (e.g., `DynamicList`), but its Real counterpart (e.g., `Vec<i32>`). ```rust let reflect_deserializer = UntypedReflectDeserializer::new_dynamic(®istry); let mut deserializer = ron:🇩🇪:Deserializer::from_str(input)?; // OLD let output: DynamicStruct = reflect_deserializer.deserialize(&mut deserializer)?.take()?; // NEW let output: SomeStruct = reflect_deserializer.deserialize(&mut deserializer)?.take()?; ``` Alternatively, if this behavior isn't desired, use the `TypedReflectDeserializer::new_dynamic` and `UntypedReflectDeserializer::new_dynamic` methods instead: ```rust // OLD let reflect_deserializer = UntypedReflectDeserializer::new(®istry); // NEW let reflect_deserializer = UntypedReflectDeserializer::new_dynamic(®istry); ``` </details> --------- Co-authored-by: Carter Anderson <mcanders1@gmail.com>
157 lines
5.2 KiB
Rust
157 lines
5.2 KiB
Rust
use crate::Anchor;
|
|
use bevy_asset::Handle;
|
|
use bevy_ecs::{component::Component, reflect::ReflectComponent};
|
|
use bevy_math::{Rect, Vec2};
|
|
use bevy_reflect::{Reflect, TypeUuid};
|
|
use bevy_render::{color::Color, texture::Image};
|
|
use bevy_utils::HashMap;
|
|
|
|
/// An atlas containing multiple textures (like a spritesheet or a tilemap).
|
|
/// [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)
|
|
#[derive(Reflect, Debug, Clone, TypeUuid)]
|
|
#[uuid = "7233c597-ccfa-411f-bd59-9af349432ada"]
|
|
#[reflect(Debug)]
|
|
pub struct TextureAtlas {
|
|
/// The handle to the texture in which the sprites are stored
|
|
pub texture: Handle<Image>,
|
|
// 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>,
|
|
/// Mapping from texture handle to index
|
|
pub texture_handles: Option<HashMap<Handle<Image>, usize>>,
|
|
}
|
|
|
|
#[derive(Component, Debug, Clone, Reflect)]
|
|
#[reflect(Component)]
|
|
pub struct TextureAtlasSprite {
|
|
/// The tint color used to draw the sprite, defaulting to [`Color::WHITE`]
|
|
pub color: Color,
|
|
/// Texture index in [`TextureAtlas`]
|
|
pub index: usize,
|
|
/// Whether to flip the sprite in the X axis
|
|
pub flip_x: bool,
|
|
/// Whether to flip the sprite in the Y axis
|
|
pub flip_y: bool,
|
|
/// An optional custom size for the sprite that will be used when rendering, instead of the size
|
|
/// of the sprite's image in the atlas
|
|
pub custom_size: Option<Vec2>,
|
|
/// [`Anchor`] point of the sprite in the world
|
|
pub anchor: Anchor,
|
|
}
|
|
|
|
impl Default for TextureAtlasSprite {
|
|
fn default() -> Self {
|
|
Self {
|
|
index: 0,
|
|
color: Color::WHITE,
|
|
flip_x: false,
|
|
flip_y: false,
|
|
custom_size: None,
|
|
anchor: Anchor::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl TextureAtlasSprite {
|
|
/// Create a new [`TextureAtlasSprite`] with a sprite index,
|
|
/// it should be valid in the corresponding [`TextureAtlas`]
|
|
pub fn new(index: usize) -> TextureAtlasSprite {
|
|
Self {
|
|
index,
|
|
..Default::default()
|
|
}
|
|
}
|
|
}
|
|
|
|
impl TextureAtlas {
|
|
/// Create a new [`TextureAtlas`] that has a texture, but does not have
|
|
/// any individual sprites specified
|
|
pub fn new_empty(texture: Handle<Image>, dimensions: Vec2) -> Self {
|
|
Self {
|
|
texture,
|
|
size: dimensions,
|
|
texture_handles: None,
|
|
textures: Vec::new(),
|
|
}
|
|
}
|
|
|
|
/// Generate a [`TextureAtlas`] by splitting a texture into a grid where each
|
|
/// `tile_size` by `tile_size` grid-cell is one of the textures in the
|
|
/// atlas. Grid cells are separated by some `padding`, and the grid starts
|
|
/// at `offset` pixels from the top left corner. The resulting [`TextureAtlas`] is
|
|
/// indexed left to right, top to bottom.
|
|
pub fn from_grid(
|
|
texture: Handle<Image>,
|
|
tile_size: Vec2,
|
|
columns: usize,
|
|
rows: usize,
|
|
padding: Option<Vec2>,
|
|
offset: Option<Vec2>,
|
|
) -> TextureAtlas {
|
|
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);
|
|
|
|
TextureAtlas {
|
|
size: ((tile_size + current_padding) * grid_size) - current_padding,
|
|
textures: sprites,
|
|
texture,
|
|
texture_handles: None,
|
|
}
|
|
}
|
|
|
|
/// Add a sprite to the list of textures in the [`TextureAtlas`]
|
|
/// returns an index to the texture which can be used with [`TextureAtlasSprite`]
|
|
///
|
|
/// # Arguments
|
|
///
|
|
/// * `rect` - The section of the atlas that contains the texture to be added,
|
|
/// from the top-left corner of the texture to the bottom-right corner
|
|
pub fn add_texture(&mut self, rect: Rect) -> usize {
|
|
self.textures.push(rect);
|
|
self.textures.len() - 1
|
|
}
|
|
|
|
/// The number of textures in the [`TextureAtlas`]
|
|
pub fn len(&self) -> usize {
|
|
self.textures.len()
|
|
}
|
|
|
|
/// Returns `true` if there are no textures in the [`TextureAtlas`]
|
|
pub fn is_empty(&self) -> bool {
|
|
self.textures.is_empty()
|
|
}
|
|
|
|
/// Returns the index of the texture corresponding to the given image handle in the [`TextureAtlas`]
|
|
pub fn get_texture_index(&self, texture: &Handle<Image>) -> Option<usize> {
|
|
self.texture_handles
|
|
.as_ref()
|
|
.and_then(|texture_handles| texture_handles.get(texture).cloned())
|
|
}
|
|
}
|