X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_replay.h;h=e97584cceee54949a2f01480af7f132bc65c088c;hb=304647a7672165dd35ffe54884ed9aedcc9bf363;hp=b7f4a57e91ede4af0ebe8a50bf201ad3b40647ff;hpb=5f6a4f9df6c8accc89f1920bfe9ace3cbac4c4b6;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_replay.h b/player_replay.h
index b7f4a57..e97584c 100644
--- a/player_replay.h
+++ b/player_replay.h
@@ -4,6 +4,8 @@
 
 typedef struct replay_buffer replay_buffer;
 typedef struct replay_frame replay_frame;
+typedef struct replay_keyframe replay_keyframe;
+
 typedef struct replay_gamestate replay_gamestate;
 typedef struct replay_sfx replay_sfx;
 
@@ -25,11 +27,17 @@ enum replay_framedata{
    k_replay_framedata_rows
 };
 
-struct replay_frame {
-   v3f cam_pos, cam_angles;
-   f32 cam_fov;
+struct replay_cam
+{
+   v3f pos, angles;
+   f32 fov;
+};
 
+struct replay_frame 
+{
+   struct replay_cam cam;
    f64 time;
+
    replay_frame *l, *r;
 
    enum player_subsystem system;
@@ -37,16 +45,26 @@ struct replay_frame {
    u16 data_table[k_replay_framedata_rows][2];
 };
 
-struct replay_gamestate {
+/* player-defined replay frames */
+struct replay_keyframe
+{
+   struct replay_cam cam;
+   f64 time;
+};
+
+struct replay_gamestate 
+{
    rigidbody rb, glider_rb; /* TODO: these don't need to be saved with their 
                                      full matrices */
    v3f angles;
    struct player_cam_controller cam_control;
    u32 current_run_version;
+   bool drowned;
 };
 
 /* we save this per-anim-frame. if there glider is existing in any state */
-struct replay_glider_data {
+struct replay_glider_data 
+{
    bool have_glider, glider_orphan;
    f32 t;
    v3f co; 
@@ -65,17 +83,25 @@ struct replay_globals
    f32 resume_transition;
 
    enum replay_control {
-      k_replay_control_scrub,
-      k_replay_control_play,
-      k_replay_control_resume
+      k_replay_control_scrub = 0x00,
+      k_replay_control_play  = 0x01,
+      k_replay_control_resume= 0x02
    }
    replay_control;
    f32 track_velocity;
    struct gui_helper *helper_resume, *helper_freecam;
 
    vg_camera replay_freecam;
-   i32 freecam;
+
+   bool use_freecam;
+   bool show_ui;
    v3f freecam_v, freecam_w;
+
+   i32 editor_mode;
+
+   replay_keyframe keyframes[32];
+   u32 keyframe_count;
+   i32 active_keyframe;
 }
 extern player_replay;
 
@@ -95,3 +121,5 @@ void skaterift_replay_debug_info(void);
 void skaterift_record_frame( replay_buffer *replay, 
                                     int force_gamestate );
 void skaterift_replay_post_render(void);
+void skaterift_replay_init(void);
+void skaterift_get_replay_cam( vg_camera *cam );