diff options
| author | Tom Barrett <tom@tombarrett.xyz> | 2021-03-21 18:29:09 +0100 |
|---|---|---|
| committer | Tom Barrett <tom@tombarrett.xyz> | 2021-03-21 18:29:09 +0100 |
| commit | 4312f3b7eedbf6cdbe012be6eea1d45afd82de12 (patch) | |
| tree | b0ca73f322416edeabfd29a9b48b311bb0ee26e9 /src/main.rs | |
| parent | 965ccb56c4c58066939d74bea22c2a9b59416d0d (diff) | |
start using constants for the tilesheet indexes
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/main.rs b/src/main.rs index 566ded5..97592eb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,7 +13,7 @@ fn star_spawning_system(commands: &mut Commands, time: Res<Time>, mut q: Query<& timer.reset(); commands .spawn(SpriteSheetBundle { - sprite: TextureAtlasSprite::new(16), + sprite: TextureAtlasSprite::new(constants::TILESHEET_STAR1), transform: Transform { translation: Vec3 { x: thread_rng().gen_range(-300..300) as f32, @@ -59,7 +59,7 @@ pub fn setup( ..Default::default() }) .spawn(SpriteSheetBundle { - sprite: TextureAtlasSprite::new(8), + sprite: TextureAtlasSprite::new(constants::TILESHEET_COSMONAUT1), texture_atlas: atlas_handle.clone(), transform: Transform { translation: Vec3 { @@ -74,7 +74,7 @@ pub fn setup( }) .spawn((Timer::from_seconds(1.0, false),)) .spawn(SpriteSheetBundle { - sprite: TextureAtlasSprite::new(12), + sprite: TextureAtlasSprite::new(constants::TILESHEET_COSMONAUT2), texture_atlas: atlas_handle.clone(), transform: Transform { translation: Vec3 { @@ -93,7 +93,7 @@ pub fn setup( commands .spawn(SpriteSheetBundle { texture_atlas: atlas_handle.clone(), - sprite: TextureAtlasSprite::new(11), + sprite: TextureAtlasSprite::new(constants::TILESHEET_NONE1), transform: Transform { translation: Vec3 { x: ((i as f32) * 16.0 * 3.5) - 320.0, @@ -119,16 +119,22 @@ fn animation_system( timer.tick(time.delta_seconds()); if timer.finished() { let index = match sprite.index { - 9 => 10, - 10 => 13, - 13 => 14, - 11 => 12, - 16 => 17, - 17 => 18, - _ => 11, + constants::TILESHEET_EXPLOSION1 => constants::TILESHEET_EXPLOSION2, + constants::TILESHEET_EXPLOSION2 => constants::TILESHEET_EXPLOSION3, + constants::TILESHEET_EXPLOSION3 => constants::TILESHEET_EXPLOSION4, + + constants::TILESHEET_VISOR1 => constants::TILESHEET_VISOR2, + constants::TILESHEET_VISOR2 => constants::TILESHEET_VISOR3, + constants::TILESHEET_VISOR3 => constants::TILESHEET_VISOR4, + + constants::TILESHEET_STAR1 => constants::TILESHEET_STAR2, + constants::TILESHEET_STAR2 => constants::TILESHEET_STAR3, + + constants::TILESHEET_NONE1 => constants::TILESHEET_NONE2, + _ => constants::TILESHEET_NONE1, }; sprite.index = index; - if index == 12 { + if index == constants::TILESHEET_NONE2 { commands.despawn(entity); } } @@ -151,11 +157,11 @@ fn cosmonaut_detect_system( && transform.translation.x + 16.0 * 3.5 > cursor_position.x && transform.translation.y < cursor_position.y && transform.translation.y + 16.0 * 3.5 > cursor_position.y - && sprite.index == 8 + && sprite.index == constants::TILESHEET_COSMONAUT1 { commands .spawn(SpriteSheetBundle { - sprite: TextureAtlasSprite::new(9), + sprite: TextureAtlasSprite::new(constants::TILESHEET_VISOR1), transform: *transform, ..Default::default() }) |