cutscene camera editor defined target

src/cutscene.rs

@@ -1,5 +1,9 @@
-use crate::{DebugVisuals, tb_entities::CutsceneCamera};
+use crate::{
+    DebugVisuals,
+    tb_entities::{CameraTarget, CutsceneCamera},
+};
 use bevy::prelude::*;
+use bevy_trenchbroom::class::Target;
 
 #[derive(Event, Debug)]
 pub struct StartCutscene(pub String);
@@ -10,7 +14,7 @@ enum CutsceneState {
     None,
     Playing {
         timer: Timer,
-        name: String,
+        camera: Transform,
     },
 }
 
@@ -24,36 +28,43 @@ fn on_start_cutscene(
     trigger: Trigger<StartCutscene>,
     mut res: ResMut<DebugVisuals>,
     mut cutscene_state: ResMut<CutsceneState>,
+    cutscenes: Query<(&Transform, &CutsceneCamera, &Target), Without<Camera>>,
+    cam_target: Query<(&Transform, &CameraTarget), Without<Camera>>,
 ) {
     let cutscene = trigger.event().0.clone();
 
     res.cam_follow = false;
 
+    let Some((t, _, target)) = cutscenes
+        .iter()
+        .find(|(_, cutscene_camera, _)| cutscene == cutscene_camera.name)
+    else {
+        return;
+    };
+
+    let Some((target, _)) = cam_target.iter().find(|(_, camera_target)| {
+        camera_target.targetname == target.target.clone().unwrap_or_default()
+    }) else {
+        return;
+    };
+
     *cutscene_state = CutsceneState::Playing {
         timer: Timer::from_seconds(2.0, TimerMode::Once),
-        name: cutscene,
+        camera: t.looking_at(target.translation, Vec3::Y),
     };
 }
 
 fn update(
     mut res: ResMut<DebugVisuals>,
     mut cutscene_state: ResMut<CutsceneState>,
-    cutscenes: Query<(&Transform, &CutsceneCamera), Without<Camera>>,
     mut cam: Query<&mut Transform, With<Camera>>,
     time: Res<Time>,
 ) {
-    if let CutsceneState::Playing { timer, name } = &mut *cutscene_state {
+    if let CutsceneState::Playing { timer, camera } = &mut *cutscene_state {
         res.cam_follow = false;
         timer.tick(time.delta());
 
-        let Some((t, _)) = cutscenes
-            .iter()
-            .find(|(_, cutscene_camera)| name == &cutscene_camera.name)
-        else {
-            return;
-        };
-
-        *cam.single_mut() = *t;
+        *cam.single_mut() = *camera;
 
         if timer.finished() {
             res.cam_follow = true;

src/tb_entities.rs

@@ -91,6 +91,13 @@ pub struct MoveTarget {
 #[derive(PointClass, Component, Reflect, Default)]
 #[reflect(Component)]
 #[require(Transform)]
+pub struct CameraTarget {
+    pub targetname: String,
+}
+
+#[derive(PointClass, Component, Reflect, Default)]
+#[reflect(Component)]
+#[require(Transform, Target)]
 pub struct CutsceneCamera {
     pub name: String,
 }