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

fix: particles on win, fmt

Browse source
This commit is contained in:
Pascal Engélibert 2022-08-24 09:58:56 +02:00
commit 6809a30faa
Signed by: tuxmain
GPG key ID: 3504BC6D362F7DCA
4 changed files with 50 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/game.rs
View file

@ -32,14 +32,13 @@ impl Plugin for GamePlugin {
SystemSet::on_update(AppState::Game)
.with_system(crate::levels::post_setup_level)
.with_system(keyboard_input_system)
.with_system(character_particle_effect_system)
.with_system(move_camera),
.with_system(move_camera)
.with_system(character_particle_effect_system),
)
.add_system_set(
SystemSet::on_update(AppState::Win)
.with_system(keyboard_input_system)
.with_system(move_camera),
.with_system(move_camera)
.with_system(character_particle_effect_system),
)
.add_system_to_stage(CoreStage::PostUpdate, collision_event_system);
@ -221,7 +220,6 @@ fn keyboard_input_system(
if let Ok((mut selected_character_id, character_id_list)) = level_query.get_single_mut() {
if keyboard_input.just_pressed(KeyCode::Tab) {
let selected = if let Some(selected_character_id) = &mut selected_character_id.0 {
*selected_character_id = *character_id_list
.0
.range(*selected_character_id..)
@ -251,9 +249,8 @@ fn keyboard_input_system(
if let Some(selected_character_id) = &selected_character_id.0 {
if let Some((_character_id, mut velocity, _color)) = characters
.iter_mut()
.find(|(character_id, _velocity, _color)| {
*character_id == selected_character_id
}) {
.find(|(character_id, _velocity, _color)| *character_id == selected_character_id)
{
velocity.linvel.x = 200. * (right_pressed as i8 - left_pressed as i8) as f32;
if keyboard_input.just_pressed(KeyCode::Space) {
@ -271,16 +268,15 @@ fn keyboard_input_system(
fn character_particle_effect_system(
mut characters: Query<(&CharacterId, &Transform, &CharacterColor)>,
mut particle_effect: ResMut<crate::particle_effect::ParticleEffectResource>,
mut level_query: Query<(&SelectedCharacterId)>,
mut particle_effect: ResMut<crate::particle_effect::ParticleEffectResource>,
mut level_query: Query<&SelectedCharacterId>,
) {
if let Ok(selected_character_id) = level_query.get_single_mut() {
if let Some(selected_character_id) = &selected_character_id.0 {
if let Some((_character_id, transform, color)) = characters
.iter_mut()
.find(|(character_id, _transform, _color)| {
*character_id == selected_character_id
}) {
.find(|(character_id, _transform, _color)| *character_id == selected_character_id)
{
particle_effect.translation = transform.translation;
particle_effect.color = color.0;
}