projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge all features from glider feature branch
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_replay.h
diff --git
a/player_replay.h
b/player_replay.h
index 0aa370e63d1407a9d71c3d2830b61f280b95e353..42d9bf71d768f731964e6195615647acf6e4ecfc 100644
(file)
--- a/
player_replay.h
+++ b/
player_replay.h
@@
-23,7
+23,9
@@
enum replay_framedata{
k_replay_framedata_animator,
k_replay_framedata_gamestate,
k_replay_framedata_internal_gamestate,
k_replay_framedata_animator,
k_replay_framedata_gamestate,
k_replay_framedata_internal_gamestate,
- k_replay_framedata_sfx
+ k_replay_framedata_sfx,
+ k_replay_framedata_glider,
+ k_replay_framedata_rows
};
struct replay_frame {
};
struct replay_frame {
@@
-35,24
+37,29
@@
struct replay_frame {
enum player_subsystem system;
u16 total_size;
enum player_subsystem system;
u16 total_size;
- u16 data_table[
4
][2];
+ u16 data_table[
k_replay_framedata_rows
][2];
};
struct replay_gamestate {
};
struct replay_gamestate {
- rigidbody rb;
+ rigidbody rb, glider_rb; /* TODO: these don't need to be saved with their
+ full matrices */
v3f angles;
struct player_cam_controller cam_control;
};
v3f angles;
struct player_cam_controller cam_control;
};
+/* we save this per-anim-frame. if there glider is existing in any state */
+struct replay_glider_data {
+ bool have_glider, glider_orphan;
+ f32 t;
+ v3f co;
+ v4f q;
+};
+
struct replay_sfx {
u32 none;
};
struct replay_sfx {
u32 none;
};
-static replay_frame *replay_newframe( replay_buffer *replay,
- u16 animator_size,
- u16 gamestate_size,
- u16 sfx_count );
-static void replay_seek( replay_buffer *replay, f64 t );
+static int replay_seek( replay_buffer *replay, f64 t );
static replay_frame *replay_find_recent_stateframe( replay_buffer *replay );
static void replay_get_camera( replay_buffer *replay, camera *cam );
static replay_frame *replay_find_recent_stateframe( replay_buffer *replay );
static void replay_get_camera( replay_buffer *replay, camera *cam );