-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from Fabinistere/develop
- Loading branch information
Showing
11 changed files
with
559 additions
and
287 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| //! This is a speedrun to have an cinematic in this game-mockup | ||
| //! Do not use it as example (not a good one at least) | ||
| use bevy::prelude::*; | ||
|
|
||
| use crate::{ | ||
| characters::npcs::NPC, | ||
| constants::{FRAME_TIME, locations::LEVEL_SCALE, cinematics::*}, | ||
| tablet::mind_control::MindControled, | ||
| spritesheet::AnimationTimer, | ||
| }; | ||
|
|
||
| /* -------------------------------------------------------------------------- */ | ||
| /* Final */ | ||
| /* -------------------------------------------------------------------------- */ | ||
|
|
||
| /// Marker for the final cat sprite anim | ||
| #[derive(Component)] | ||
| struct FinalFormCat; | ||
|
|
||
| /// Marker for the final cat sprite anim | ||
| #[derive(Component)] | ||
| pub struct Clouds; | ||
|
|
||
| #[derive(Component)] | ||
| pub struct PlayerHusk; | ||
|
|
||
| pub fn cinematic_camera( | ||
| mut camera_query: Query<&mut Transform, With<Camera>>, | ||
| ) { | ||
| let mut camera_transform = camera_query.single_mut(); | ||
|
|
||
| camera_transform.translation.x = 0.; | ||
| camera_transform.translation.y = 3.; | ||
|
|
||
| camera_transform.scale = Vec3::new(1.4, 1.4, 1.) | ||
| } | ||
|
|
||
| pub fn spawn_cinematic_final( | ||
| mut commands: Commands, | ||
| asset_server: Res<AssetServer>, | ||
| mut texture_atlases: ResMut<Assets<TextureAtlas>>, | ||
| mut clear_color: ResMut<ClearColor>, | ||
|
|
||
| blue_cat_controlled_query: Query<Entity, (Without<NPC>, With<MindControled>)>, | ||
| ) { | ||
| info!("Spawn Cinematic"); | ||
|
|
||
| clear_color.0 = Color::rgb(0.753, 0.126, 0.158); | ||
|
|
||
| commands.spawn(( | ||
| SpriteBundle { | ||
| texture: asset_server.load("textures/cinematics/final/FullClouds.png"), | ||
| transform: Transform { | ||
| translation: Vec3::from((CLOUDS_RESET, 0., 1.)), | ||
| scale: Vec3::from(LEVEL_SCALE), | ||
| ..default() | ||
| }, | ||
| ..default() | ||
| }, | ||
| Name::new("Cinematics - Clouds"), | ||
| Clouds, | ||
| // -- Animation -- | ||
| AnimationTimer(Timer::from_seconds(FRAME_TIME, TimerMode::Repeating)), | ||
| )); | ||
|
|
||
| commands.spawn(( | ||
| SpriteBundle { | ||
| texture: asset_server.load("textures/cinematics/final/FullClouds.png"), | ||
| transform: Transform { | ||
| translation: Vec3::from((SECOND_CLOUDS_INIT, 0., 1.)), | ||
| scale: Vec3::from(LEVEL_SCALE), | ||
| ..default() | ||
| }, | ||
| ..default() | ||
| }, | ||
| Name::new("Cinematics - Clouds"), | ||
| Clouds, | ||
| // -- Animation -- | ||
| AnimationTimer(Timer::from_seconds(FRAME_TIME, TimerMode::Repeating)), | ||
| )); | ||
|
|
||
| commands.spawn(( | ||
| SpriteBundle { | ||
| texture: asset_server.load("textures/cinematics/final/evasion-mountain-lab.png"), | ||
| transform: Transform { | ||
| translation: Vec3::from((0., 0., 2.)), | ||
| scale: Vec3::from(LEVEL_SCALE), | ||
| ..default() | ||
| }, | ||
| ..default() | ||
| }, | ||
| Name::new("Cinematics - Mountain Lab"), | ||
| )); | ||
|
|
||
| let cat_escape_image = if blue_cat_controlled_query.is_empty() { | ||
| info!("EasterEgg: Black Cat Escaped"); | ||
| asset_server.load("textures/cinematics/final/black-cat-sheet.png") | ||
| } else { | ||
| info!("NormalEnd: Blue Cat Escaped"); | ||
| asset_server.load("textures/cinematics/final/blue-cat-sheet.png") | ||
| }; | ||
|
|
||
| let cat_escape_atlas = TextureAtlas::from_grid( | ||
| cat_escape_image, | ||
| Vec2::from((19., 17.)), | ||
| 14, | ||
| 1, | ||
| None, | ||
| None, | ||
| ); | ||
| let cat_escape_atlas_handle = texture_atlases.add(cat_escape_atlas); | ||
|
|
||
| commands.spawn(( | ||
| SpriteSheetBundle { | ||
| texture_atlas: cat_escape_atlas_handle.clone(), | ||
| transform: Transform { | ||
| translation: Vec3::from((12., -12., 9.)), | ||
| scale: Vec3::from(LEVEL_SCALE), | ||
| ..default() | ||
| }, | ||
| ..default() | ||
| }, | ||
| Name::new("Cinematics - Cat"), | ||
| PlayerHusk, | ||
| // -- Animation -- | ||
| AnimationTimer(Timer::from_seconds(FRAME_TIME, TimerMode::Repeating)), | ||
| )); | ||
|
|
||
| info!("Cinematic Spawned"); | ||
| } | ||
|
|
||
| // TODO: spawn a Quit button after x seconds | ||
| // TODO: adpat the camera to be centered on the endcinematic | ||
|
|
||
| // LEVEL_SCALE | ||
|
|
||
| /// Infinitly loop the clouds | ||
| pub fn animate_clouds( | ||
| time: Res<Time>, | ||
| mut clouds_query: Query< | ||
| ( | ||
| &mut AnimationTimer, | ||
| &mut Transform, | ||
| ), | ||
| With<Clouds>, | ||
| >, | ||
| ) { | ||
| for (mut timer, mut transform) in &mut clouds_query { | ||
| timer.tick(time.delta()); | ||
|
|
||
| if timer.just_finished() { | ||
| transform.translation.x = | ||
| if transform.translation.x == CLOUDS_LIMIT { | ||
| CLOUDS_RESET | ||
| } else { | ||
| // IDEA: can be smoother if - 0.1 and faster timer | ||
| transform.translation.x - 1. | ||
| }; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn animate_free_cat( | ||
| texture_atlases: Res<Assets<TextureAtlas>>, | ||
|
|
||
| time: Res<Time>, | ||
| mut running_cat: Query< | ||
| ( | ||
| &mut AnimationTimer, | ||
| &mut TextureAtlasSprite, | ||
| &Handle<TextureAtlas>, | ||
| ), | ||
| With<PlayerHusk>, | ||
| >, | ||
| ) { | ||
| for (mut timer, mut sprite, texture_atlas_handle) in &mut running_cat { | ||
| timer.tick(time.delta()); | ||
|
|
||
| if timer.just_finished() { | ||
| let texture_atlas = texture_atlases.get(texture_atlas_handle).unwrap(); | ||
|
|
||
| sprite.index = if sprite.index + 1 < texture_atlas.textures.len() { | ||
| sprite.index + 1 | ||
| } else if sprite.index == texture_atlas.textures.len() - 1 { | ||
| texture_atlas.textures.len() - 2 | ||
| } else { | ||
| warn!("Overflow CatAnim FinalCinematic"); | ||
| texture_atlas.textures.len() - 2 | ||
| }; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.