Compare commits

..

No commits in common. "2d00bbb2db23fb43db58604847017e034391a5ad" and "95e32b36899434a52567afc612e22fbdb142b9a4" have entirely different histories.

2 changed files with 3 additions and 8 deletions

View File

@ -65,10 +65,6 @@ impl Default for SpawnPortals {
} }
} }
#[derive(Default, Component, Clone, Debug, Reflect)]
#[reflect(Component)]
pub struct Zone;
pub trait ITileType { pub trait ITileType {
fn blocks_motion(&self) -> bool; fn blocks_motion(&self) -> bool;
fn blocks_visibility(&self) -> bool; fn blocks_visibility(&self) -> bool;
@ -240,13 +236,13 @@ fn spawn_colliders<D: 'static + Clone + Default + Send + Sync>(
.insert(shape) .insert(shape)
.insert(Sensor) .insert(Sensor)
.insert(ActiveEvents::COLLISION_EVENTS) .insert(ActiveEvents::COLLISION_EVENTS)
.insert_bundle(TransformBundle::from_transform(Transform::from_xyz( .insert(Transform::from_xyz(
position.translation.x, position.translation.x,
position.translation.y, position.translation.y,
0., 0.,
))) ))
.insert(GlobalTransform::default())
.insert(Area(aabb)) .insert(Area(aabb))
.insert(Zone)
.id(); .id();
commands.entity(map_entity).push_children(&[id]); commands.entity(map_entity).push_children(&[id]);
} }

View File

@ -29,7 +29,6 @@ struct Calculating(Task<Option<Path>>);
pub struct Destination(pub (i32, i32)); pub struct Destination(pub (i32, i32));
impl_pointlike_for_tuple_component!(Destination); impl_pointlike_for_tuple_component!(Destination);
impl_pointlike_for_tuple_component!(&Destination);
#[derive(Component, Clone, Debug, Default, Reflect)] #[derive(Component, Clone, Debug, Default, Reflect)]
#[reflect(Component)] #[reflect(Component)]