tuxmain/bevyjam
tuxmain/bevyjam
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix: character ordering

Browse source
This commit is contained in:
Pascal Engélibert 2022-08-27 10:17:49 +02:00
commit 84ba344597
Signed by: tuxmain
GPG key ID: 3504BC6D362F7DCA
2 changed files with 46 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/levels.rs
View file

@ -16,7 +16,12 @@ pub fn setup_level(
level_startup_event.send(LevelStartupEvent);
}
pub fn despawn_level(mut commands: Commands, level_query: Query<Entity, With<Level>>) {
pub fn despawn_level(
mut commands: Commands,
mut character_list: ResMut<CharacterList>,
level_query: Query<Entity, With<Level>>,
) {
character_list.0.clear();
for entity in level_query.iter() {
commands.entity(entity).despawn_recursive();
}
@ -32,6 +37,7 @@ pub fn post_setup_level(
mut level_startup_event: EventReader<LevelStartupEvent>,
asset_server: Res<AssetServer>,
audio: Res<crossbeam_channel::Sender<AudioMsg>>,
mut character_list: ResMut<CharacterList>,
stored_levels_assets: Res<Assets<StoredLevels>>,
stored_levels_handle: Res<Handle<StoredLevels>>,
) {
@ -50,6 +56,7 @@ pub fn post_setup_level(
&mut materials,
&asset_server,
&audio,
&mut character_list,
stored_level,
);
}
@ -64,6 +71,7 @@ pub fn spawn_stored_level(
materials: &mut ResMut<Assets<ColorMaterial>>,
asset_server: &Res<AssetServer>,
audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
character_list: &mut ResMut<CharacterList>,
stored_level: &StoredLevel,
) {
@ -84,6 +92,7 @@ pub fn spawn_stored_level(
character_meshes,
materials,
audio,
character_list,
stored_level.characters.iter().map(|character| {
(
Transform::from_xyz(character.pos.x, character.pos.y, 0.),