mirror of
https://github.com/bevyengine/bevy
synced 2025-01-27 20:35:21 +00:00
faeccd7a09
This is an effort to provide the correct `#[reflect_value(...)]` attributes where they are needed. Supersedes #1533 and resolves #1528. --- I am working under the following assumptions (thanks to @bjorn3 and @Davier for advice here): - Any `enum` that derives `Reflect` and one or more of { `Serialize`, `Deserialize`, `PartialEq`, `Hash` } needs a `#[reflect_value(...)]` attribute containing the same subset of { `Serialize`, `Deserialize`, `PartialEq`, `Hash` } that is present on the derive. - Same as above for `struct` and `#[reflect(...)]`, respectively. - If a `struct` is used as a component, it should also have `#[reflect(Component)]` - All reflected types should be registered in their plugins I treated the following as components (added `#[reflect(Component)]` if necessary): - `bevy_render` - `struct RenderLayers` - `bevy_transform` - `struct GlobalTransform` - `struct Parent` - `struct Transform` - `bevy_ui` - `struct Style` Not treated as components: - `bevy_math` - `struct Size<T>` - `struct Rect<T>` - Note: The updates for `Size<T>` and `Rect<T>` in `bevy::math::geometry` required using @Davier's suggestion to add `+ PartialEq` to the trait bound. I then registered the specific types used over in `bevy_ui` such as `Size<Val>`, etc. in `bevy_ui`'s plugin, since `bevy::math` does not contain a plugin. - `bevy_render` - `struct Color` - `struct PipelineSpecialization` - `struct ShaderSpecialization` - `enum PrimitiveTopology` - `enum IndexFormat` Not Addressed: - I am not searching for components in Bevy that are _not_ reflected. So if there are components that are not reflected that should be reflected, that will need to be figured out in another PR. - I only added `#[reflect(...)]` or `#[reflect_value(...)]` entries for the set of four traits { `Serialize`, `Deserialize`, `PartialEq`, `Hash` } _if they were derived via `#[derive(...)]`_. I did not look for manual trait implementations of the same set of four, nor did I consider any traits outside the four. Are those other possibilities something that needs to be looked into?
184 lines
3.9 KiB
Rust
184 lines
3.9 KiB
Rust
use bevy_reflect::Reflect;
|
|
use glam::Vec2;
|
|
use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Sub, SubAssign};
|
|
|
|
/// A two dimensional "size" as defined by a width and height
|
|
#[derive(Copy, Clone, PartialEq, Debug, Reflect)]
|
|
#[reflect(PartialEq)]
|
|
pub struct Size<T: Reflect + PartialEq = f32> {
|
|
pub width: T,
|
|
pub height: T,
|
|
}
|
|
|
|
impl<T: Reflect + PartialEq> Size<T> {
|
|
pub fn new(width: T, height: T) -> Self {
|
|
Size { width, height }
|
|
}
|
|
}
|
|
|
|
impl<T: Default + Reflect + PartialEq> Default for Size<T> {
|
|
fn default() -> Self {
|
|
Self {
|
|
width: Default::default(),
|
|
height: Default::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A rect, as defined by its "side" locations
|
|
#[derive(Copy, Clone, PartialEq, Debug, Reflect)]
|
|
#[reflect(PartialEq)]
|
|
pub struct Rect<T: Reflect + PartialEq> {
|
|
pub left: T,
|
|
pub right: T,
|
|
pub top: T,
|
|
pub bottom: T,
|
|
}
|
|
|
|
impl<T: Reflect + PartialEq> Rect<T> {
|
|
pub fn all(value: T) -> Self
|
|
where
|
|
T: Clone,
|
|
{
|
|
Rect {
|
|
left: value.clone(),
|
|
right: value.clone(),
|
|
top: value.clone(),
|
|
bottom: value,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T: Default + Reflect + PartialEq> Default for Rect<T> {
|
|
fn default() -> Self {
|
|
Self {
|
|
left: Default::default(),
|
|
right: Default::default(),
|
|
top: Default::default(),
|
|
bottom: Default::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T: Reflect + PartialEq> Add<Vec2> for Size<T>
|
|
where
|
|
T: Add<f32, Output = T>,
|
|
{
|
|
type Output = Size<T>;
|
|
|
|
fn add(self, rhs: Vec2) -> Self::Output {
|
|
Self {
|
|
width: self.width + rhs.x,
|
|
height: self.height + rhs.y,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T: Reflect + PartialEq> AddAssign<Vec2> for Size<T>
|
|
where
|
|
T: AddAssign<f32>,
|
|
{
|
|
fn add_assign(&mut self, rhs: Vec2) {
|
|
self.width += rhs.x;
|
|
self.height += rhs.y;
|
|
}
|
|
}
|
|
|
|
impl<T: Reflect + PartialEq> Sub<Vec2> for Size<T>
|
|
where
|
|
T: Sub<f32, Output = T>,
|
|
{
|
|
type Output = Size<T>;
|
|
|
|
fn sub(self, rhs: Vec2) -> Self::Output {
|
|
Self {
|
|
width: self.width - rhs.x,
|
|
height: self.height - rhs.y,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T: Reflect + PartialEq> SubAssign<Vec2> for Size<T>
|
|
where
|
|
T: SubAssign<f32>,
|
|
{
|
|
fn sub_assign(&mut self, rhs: Vec2) {
|
|
self.width -= rhs.x;
|
|
self.height -= rhs.y;
|
|
}
|
|
}
|
|
|
|
impl<T: Reflect + PartialEq> Mul<f32> for Size<T>
|
|
where
|
|
T: Mul<f32, Output = T>,
|
|
{
|
|
type Output = Size<T>;
|
|
|
|
fn mul(self, rhs: f32) -> Self::Output {
|
|
Self::Output {
|
|
width: self.width * rhs,
|
|
height: self.height * rhs,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T: Reflect + PartialEq> MulAssign<f32> for Size<T>
|
|
where
|
|
T: MulAssign<f32>,
|
|
{
|
|
fn mul_assign(&mut self, rhs: f32) {
|
|
self.width *= rhs;
|
|
self.height *= rhs;
|
|
}
|
|
}
|
|
|
|
impl<T: Reflect + PartialEq> Div<f32> for Size<T>
|
|
where
|
|
T: Div<f32, Output = T>,
|
|
{
|
|
type Output = Size<T>;
|
|
|
|
fn div(self, rhs: f32) -> Self::Output {
|
|
Self::Output {
|
|
width: self.width / rhs,
|
|
height: self.height / rhs,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<T: Reflect + PartialEq> DivAssign<f32> for Size<T>
|
|
where
|
|
T: DivAssign<f32>,
|
|
{
|
|
fn div_assign(&mut self, rhs: f32) {
|
|
self.width /= rhs;
|
|
self.height /= rhs;
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn size_ops() {
|
|
type SizeF = Size<f32>;
|
|
|
|
assert_eq!(
|
|
SizeF::new(10., 10.) + Vec2::new(10., 10.),
|
|
SizeF::new(20., 20.)
|
|
);
|
|
assert_eq!(
|
|
SizeF::new(20., 20.) - Vec2::new(10., 10.),
|
|
SizeF::new(10., 10.)
|
|
);
|
|
assert_eq!(SizeF::new(10., 10.) * 2., SizeF::new(20., 20.));
|
|
assert_eq!(SizeF::new(20., 20.) / 2., SizeF::new(10., 10.));
|
|
|
|
let mut size = SizeF::new(10., 10.);
|
|
|
|
size += Vec2::new(10., 10.);
|
|
|
|
assert_eq!(size, SizeF::new(20., 20.));
|
|
}
|
|
}
|