From 492c4238cb700de5ef367254e348a17a6aa26829 Mon Sep 17 00:00:00 2001
From: Nixon <voxell.technologies@gmail.com>
Date: Sun, 28 Aug 2022 17:04:02 +0800
Subject: [PATCH] added initial zoom out timer - to view the overall level

---
 src/game.rs   | 33 +++++++++++++++++++++++----------
 src/levels.rs | 22 ++++++++++++++++++++--
 src/main.rs   |  2 +-
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/game.rs b/src/game.rs
index 9562b99..b94eb90 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -2,8 +2,8 @@
 #![allow(clippy::too_many_arguments)]
 
 pub use crate::filters::*;
-
 use crate::{AppState, audio_system};
+use crate::levels;
 
 use bevy::{
 	ecs::system::EntityCommands,
@@ -28,6 +28,7 @@ impl Plugin for GamePlugin {
 			.init_resource::<CharacterMeshes>()
 			.insert_resource(CurrentLevel(None))
 			.init_resource::<CharacterList>()
+			.init_resource::<levels::ZoomTimer>()
 			.add_system_set(SystemSet::on_enter(AppState::Game).with_system(setup))
 			.add_system_set(SystemSet::on_enter(AppState::Win).with_system(win_setup))
 			.add_system_set(
@@ -39,14 +40,14 @@ impl Plugin for GamePlugin {
 					.with_system(change_character_system)
 					.with_system(player_movement_system)
 					.with_system(level_keyboard_system)
-					.with_system(move_camera)
+					.with_system(camera_system)
 					.with_system(character_particle_effect_system),
 			)
 			.add_system_set(
 				SystemSet::on_update(AppState::Win)
 					.with_system(player_movement_system)
 					.with_system(level_keyboard_system)
-					.with_system(move_camera)
+					.with_system(camera_system)
 					.with_system(character_particle_effect_system)
 					.with_system(move_win_text_system),
 			)
@@ -136,13 +137,14 @@ fn setup(
 	first_level: Res<FirstLevel>,
 	mut current_level: ResMut<CurrentLevel>,
 	mut level_startup_event: EventWriter<LevelStartupEvent>,
-	mut camera_query: Query<&mut Transform, With<Camera>>,
+	mut camera_query: Query<(&mut Transform, &mut OrthographicProjection), With<Camera>>,
+	mut zoom_timer: ResMut<levels::ZoomTimer>,
 ) {
 	if current_level.0.is_none() {
 		current_level.0 = Some(first_level.0);
 	}
 
-	crate::levels::setup_level(&mut level_startup_event, &mut camera_query);
+	crate::levels::setup_level(&mut level_startup_event, &mut camera_query, &mut zoom_timer);
 }
 
 pub fn spawn_characters<I: IntoIterator<Item = (Transform, Color)>>(
@@ -560,16 +562,22 @@ fn win_setup(
 		.insert(WinText);
 }
 
-fn move_camera(
-	mut camera_query: Query<(&Camera, &mut Transform)>,
+fn camera_system(
+	mut camera_query: Query<(&Camera, &mut OrthographicProjection, &mut Transform)>,
 	characters: Query<&Transform, (Without<Camera>, With<Player>)>,
 	time: Res<Time>,
+	mut zoom_timer: ResMut<levels::ZoomTimer>,
 ) {
+	fn lerp(x: f32, y: f32, t: f32,) -> f32 {
+		return ((y - x) * t) + x;
+	}
+
 	const MARGIN: f32 = 300.0;
 	const FOLLOW_SPEED: f32 = std::f32::consts::PI;
+	const ZOOM_SPEED: f32 = std::f32::consts::E;
 
 	for character_transform in characters.iter() {
-		let (camera, mut camera_transform) = camera_query.single_mut();
+		let (camera, mut projection, mut camera_transform) = camera_query.single_mut();
 
 		let size: Vec2 = camera.logical_viewport_size().unwrap();
 		let half_height: f32 = size.y * 0.5;
@@ -581,6 +589,10 @@ fn move_camera(
 			.translation
 			.lerp(target_translation, time.delta_seconds() * FOLLOW_SPEED);
 
+		if zoom_timer.0.finished() {
+			projection.scale = lerp(projection.scale, 1.0, time.delta_seconds() * ZOOM_SPEED);
+		} else { zoom_timer.0.tick(time.delta()); }
+
 		// always make sure that camera is away from the object in order to render them
 		camera_transform.translation.z = 999.0;
 	}
@@ -601,11 +613,12 @@ fn level_keyboard_system(
 	mut commands: Commands,
 	mut current_level: ResMut<CurrentLevel>,
 	mut level_startup_event: EventWriter<LevelStartupEvent>,
-	mut camera_query: Query<&mut Transform, With<Camera>>,
+	mut camera_query: Query<(&mut Transform, &mut OrthographicProjection), With<Camera>>,
 	keyboard_input: Res<Input<KeyCode>>,
 	mut character_list: ResMut<CharacterList>,
 	level_query: Query<Entity, With<Level>>,
 	mut app_state: ResMut<State<AppState>>,
+	mut zoom_timer: ResMut<levels::ZoomTimer>,
 ) {
 	if app_state.current() == &AppState::Win && keyboard_input.just_pressed(KeyCode::Return) {
 		current_level.0 = Some(LevelId(
@@ -620,7 +633,7 @@ fn level_keyboard_system(
 			commands.entity(entity).despawn_recursive();
 		}
 		if app_state.replace(AppState::Game).is_err() {
-			crate::levels::setup_level(&mut level_startup_event, &mut camera_query);
+			crate::levels::setup_level(&mut level_startup_event, &mut camera_query, &mut zoom_timer);
 		}
 	}
 }
diff --git a/src/levels.rs b/src/levels.rs
index 11af657..8e5b6b5 100644
--- a/src/levels.rs
+++ b/src/levels.rs
@@ -1,5 +1,7 @@
 #![allow(clippy::too_many_arguments)]
 
+use std::time::Duration;
+
 pub use stored::*;
 
 use crate::game::*;
@@ -7,11 +9,27 @@ use crate::game::*;
 use bevy::{prelude::*, reflect::TypeUuid};
 use serde::{Deserialize, Serialize};
 
+#[derive(Component)]
+pub struct ZoomTimer(pub Timer);
+
+impl Default for ZoomTimer {
+	fn default() -> Self {
+		Self {
+			0: Timer::new(Duration::new(2, 0), false),
+		}
+	}
+}
+
 pub fn setup_level(
 	level_startup_event: &mut EventWriter<LevelStartupEvent>,
-	camera_query: &mut Query<&mut Transform, With<Camera>>,
+	camera_query: &mut Query<(&mut Transform, &mut OrthographicProjection), With<Camera>>,
+	zoom_timer: &mut ResMut<ZoomTimer>,
 ) {
-	camera_query.single_mut().translation = Default::default();
+	let (mut transform, mut projection) = camera_query.single_mut();
+	transform.translation = Default::default();
+	projection.scale = 3.0;
+
+	zoom_timer.0.reset();
 
 	level_startup_event.send(LevelStartupEvent);
 }
diff --git a/src/main.rs b/src/main.rs
index bfa942f..d819cb8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -73,7 +73,7 @@ fn main() {
 		.add_plugins(DefaultPlugins)
 		.add_plugin(audio_system::AudioSystemPlugin)
 		//.add_plugin(RapierDebugRenderPlugin::default())
-		//.add_plugin(bevy_inspector_egui::WorldInspectorPlugin::new())
+		// .add_plugin(bevy_inspector_egui::WorldInspectorPlugin::new())
 		.add_plugin(JsonAssetPlugin::<levels::StoredLevels>::new(&[
 			"levels.json",
 		]));