projects/blackout
1
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into bevy-0.12

Browse Source
This commit is contained in:
Nolan Darilek 2024-03-24 12:22:12 -05:00
commit 0a28702b2a
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/map.rs
View File

@ -220,8 +220,8 @@ fn spawn_colliders<D: 'static + Clone + Default + Send + Sync>(
let position = let position =
Isometry2::new(Vector2::new(room.center().x(), room.center().y()), 0.); Isometry2::new(Vector2::new(room.center().x(), room.center().y()), 0.);
let aabb = shape.raw.compute_aabb(&position); let aabb = shape.raw.compute_aabb(&position);
let id = commands commands.entity(map_entity).with_children(|parent| {
.spawn(( parent.spawn((
TransformBundle::from_transform(Transform::from_xyz( TransformBundle::from_transform(Transform::from_xyz(
position.translation.x, position.translation.x,
position.translation.y, position.translation.y,
@ -232,9 +232,8 @@ fn spawn_colliders<D: 'static + Clone + Default + Send + Sync>(
ActiveEvents::COLLISION_EVENTS, ActiveEvents::COLLISION_EVENTS,
Area(aabb), Area(aabb),
Zone, Zone,
)) ));
.id(); });
commands.entity(map_entity).push_children(&[id]);
} }
} }
} }
@ -280,13 +279,12 @@ fn spawn_portals<D: 'static + Clone + Default + Send + Sync>(
} }
} }
for (x, y) in portals { for (x, y) in portals {
let portal = commands commands.entity(map_entity).with_children(|parent| {
.spawn(PortalBundle { parent.spawn(PortalBundle {
transform: Transform::from_translation(Vec3::new(x, y, 0.)), transform: Transform::from_translation(Vec3::new(x, y, 0.)),
..default() ..default()
}) });
.id(); });
commands.entity(map_entity).push_children(&[portal]);
} }
} }
} }