From f9d06ca70d739b13933028bf7fff57602dd5571f Mon Sep 17 00:00:00 2001 From: Noah Date: Mon, 20 Mar 2023 13:39:14 -0400 Subject: [PATCH 1/3] Impl FromReflect for TilePos --- src/tiles/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tiles/mod.rs b/src/tiles/mod.rs index d253b3b4..78545198 100644 --- a/src/tiles/mod.rs +++ b/src/tiles/mod.rs @@ -2,7 +2,7 @@ mod storage; use bevy::{ math::{UVec2, Vec2}, - prelude::{Bundle, Color, Component, Reflect}, + prelude::{Bundle, Color, Component, Reflect, FromReflect}, }; pub use storage::*; @@ -10,7 +10,7 @@ use crate::map::TilemapId; use crate::TilemapSize; /// A tile position in the tilemap grid. -#[derive(Component, Reflect, Default, Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd)] +#[derive(Component, Reflect, FromReflect, Default, Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd)] pub struct TilePos { pub x: u32, pub y: u32, From aade46b9429d21eae87969603d2b4ba56a6ac787 Mon Sep 17 00:00:00 2001 From: Noah Date: Mon, 20 Mar 2023 13:40:34 -0400 Subject: [PATCH 2/3] Derive FromReflect for TilePos --- src/tiles/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tiles/mod.rs b/src/tiles/mod.rs index 544018c7..e0c96703 100644 --- a/src/tiles/mod.rs +++ b/src/tiles/mod.rs @@ -2,7 +2,7 @@ mod storage; use bevy::{ math::{UVec2, Vec2}, - prelude::{Bundle, Color, Component, Reflect, ReflectComponent}, + prelude::{Bundle, Color, Component, Reflect, FromReflect, ReflectComponent}, }; pub use storage::*; @@ -10,7 +10,7 @@ use crate::map::TilemapId; use crate::TilemapSize; /// A tile position in the tilemap grid. -#[derive(Component, Reflect, Default, Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd)] +#[derive(Component, Reflect, FromReflect, Default, Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd)] #[reflect(Component)] pub struct TilePos { pub x: u32, From 9581dbe323ef010a04a6116a4db03228536e7ad5 Mon Sep 17 00:00:00 2001 From: Noah Date: Mon, 20 Mar 2023 14:10:29 -0400 Subject: [PATCH 3/3] fix fmt --- src/tiles/mod.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tiles/mod.rs b/src/tiles/mod.rs index e0c96703..b3de4366 100644 --- a/src/tiles/mod.rs +++ b/src/tiles/mod.rs @@ -2,7 +2,7 @@ mod storage; use bevy::{ math::{UVec2, Vec2}, - prelude::{Bundle, Color, Component, Reflect, FromReflect, ReflectComponent}, + prelude::{Bundle, Color, Component, FromReflect, Reflect, ReflectComponent}, }; pub use storage::*; @@ -10,7 +10,9 @@ use crate::map::TilemapId; use crate::TilemapSize; /// A tile position in the tilemap grid. -#[derive(Component, Reflect, FromReflect, Default, Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd)] +#[derive( + Component, Reflect, FromReflect, Default, Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, +)] #[reflect(Component)] pub struct TilePos { pub x: u32,