cutscene camera editor defined target

assets/maps/map1.map

@@ -983,8 +983,9 @@
 {
 "classname" "cutscene_camera"
 "origin" "-56 -648 264"
-"angles" "0 45 0"
+"angles" "0 0 0"
 "name" "fence_01"
+"target" "cam_target_01"
 }
 // entity 26
 {
@@ -995,9 +996,10 @@
 // entity 27
 {
 "classname" "cutscene_camera"
-"origin" "744 4632 344"
+"origin" "792 5464 1224"
 "name" "fence_02"
 "angles" "0 90 0"
+"target" "cam_target_02"
 }
 // entity 28
 {
@@ -1023,3 +1025,15 @@
 ( 928 6656 -272 ) ( 928 6656 -271 ) ( 928 6657 -272 ) origin [ 0 1 0 0 ] [ 0 0 -1 0 ] 180 1 1
 }
 }
+// entity 29
+{
+"classname" "camera_target"
+"origin" "1143.38 248 -232"
+"targetname" "cam_target_01"
+}
+// entity 30
+{
+"classname" "camera_target"
+"origin" "1176 6872 -264"
+"targetname" "cam_target_02"
+}

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
+        *cam.single_mut() = *camera;
-            .iter()
-            .find(|(_, cutscene_camera)| name == &cutscene_camera.name)
-        else {
-            return;
-        };
-
-        *cam.single_mut() = *t;
 
         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,
 }

trenchbroom/hedz/hedz.fgd

@@ -56,6 +56,11 @@
  NOTE: Changing to 2, for example, will cause the bmodel to initially be solid black. You’ll need to add minlight or lights with _light_channel_mask 2."
 ]
 
+@PointClass base(transform) = camera_target
+[
+	targetname(string) : "targetname" : "" : ""
+]
+
 @PointClass base(transform) model({ "path": "models/cash.glb" }) = cash_spawn
 [
 ]
@@ -64,7 +69,7 @@
 [
 ]
 
-@PointClass base(transform) = cutscene_camera
+@PointClass base(transform, target) = cutscene_camera
 [
 	name(string) : "name" : "" : ""
 ]