diff --git a/Cargo.lock b/Cargo.lock index e78f1ff..73a41d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -708,6 +708,16 @@ dependencies = [ "smallvec", ] +[[package]] +name = "bevy_debug_log" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c510232d5f2518eca429fe62ebb77b056cf100ea207950f974ed4d6f44003fb4" +dependencies = [ + "bevy", + "time", +] + [[package]] name = "bevy_derive" version = "0.15.3" @@ -2180,6 +2190,15 @@ dependencies = [ "syn", ] +[[package]] +name = "deranged" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058" +dependencies = [ + "powerfmt", +] + [[package]] name = "derive_more" version = "1.0.0" @@ -2927,6 +2946,7 @@ dependencies = [ "bevy-ui-gradients", "bevy_asset_loader", "bevy_ballistic", + "bevy_debug_log", "bevy_polyline", "bevy_sprite3d", "bevy_trenchbroom", @@ -3622,6 +3642,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.4.2" @@ -4176,6 +4202,12 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "pp-rs" version = "0.2.1" @@ -5134,6 +5166,38 @@ dependencies = [ "weezl", ] +[[package]] +name = "time" +version = "0.3.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +dependencies = [ + "deranged", + "itoa", + "js-sys", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + +[[package]] +name = "time-macros" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +dependencies = [ + "num-conv", + "time-core", +] + [[package]] name = "tiny-keccak" version = "2.0.2" diff --git a/Cargo.toml b/Cargo.toml index 5866f61..24993a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,6 +33,7 @@ bevy-inspector-egui = { version = "0.30", optional = true } bevy_polyline = "0.11.0" bevy_ballistic = "0.1.0" bevy-ui-gradients = "0.2.0" +bevy_debug_log = "0.5.0" [lints.clippy] too_many_arguments = "allow" diff --git a/src/cutscene.rs b/src/cutscene.rs index e17603d..aacf098 100644 --- a/src/cutscene.rs +++ b/src/cutscene.rs @@ -1,6 +1,6 @@ use crate::{ GameState, - camera::CameraState, + camera::{CameraState, MainCamera}, tb_entities::{CameraTarget, CutsceneCamera, CutsceneCameraMovementEnd}, }; use bevy::prelude::*; @@ -30,9 +30,12 @@ fn on_start_cutscene( trigger: Trigger, mut cam_state: ResMut, mut cutscene_state: ResMut, - cutscenes: Query<(&Transform, &CutsceneCamera, &Target), Without>, - cutscene_movement: Query<(&Transform, &CutsceneCameraMovementEnd, &Target), Without>, - cam_target: Query<(&Transform, &CameraTarget), Without>, + cutscenes: Query<(&Transform, &CutsceneCamera, &Target), Without>, + cutscene_movement: Query< + (&Transform, &CutsceneCameraMovementEnd, &Target), + Without, + >, + cam_target: Query<(&Transform, &CameraTarget), Without>, ) { let cutscene = trigger.event().0.clone(); @@ -68,7 +71,7 @@ fn on_start_cutscene( fn update( mut cam_state: ResMut, mut cutscene_state: ResMut, - mut cam: Query<&mut Transform, With>, + mut cam: Query<&mut Transform, With>, time: Res