projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
animation board tweaks
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.h
diff --git
a/player.h
b/player.h
index aba87e0da6600be41ad55d401e0c1ccad737f92d..7484ce94610c1100a030fe03cc4f2c3399fdef5e 100644
(file)
--- a/
player.h
+++ b/
player.h
@@
-17,8
+17,7
@@
static i32 k_cinema_fixed = 0;
static f32 k_cinema = 0.0f;
static i32 k_invert_y = 0;
static f32 k_cinema = 0.0f;
static i32 k_invert_y = 0;
-struct player_instance
-{
+struct player_instance{
/* transform definition */
rigidbody rb, rb_gate_storage;
v3f angles, angles_storage;
/* transform definition */
rigidbody rb, rb_gate_storage;
v3f angles, angles_storage;
@@
-42,6
+41,7
@@
struct player_instance
v3f fpv_offset, /* expressed relative to rigidbody */
tpv_offset,
v3f fpv_offset, /* expressed relative to rigidbody */
tpv_offset,
+ tpv_offset_extra,
fpv_viewpoint, /* expressed relative to neck bone inverse final */
fpv_offset_smooth,
fpv_viewpoint_smooth,
fpv_viewpoint, /* expressed relative to neck bone inverse final */
fpv_offset_smooth,
fpv_viewpoint_smooth,
@@
-82,6
+82,8
@@
struct player_instance
player_pose holdout_pose;
float holdout_time;
player_pose holdout_pose;
float holdout_time;
+ struct board_pose board_pose;
+
/*
* Rewind
* ----------------------------------------------------
/*
* Rewind
* ----------------------------------------------------
@@
-232,6
+234,7
@@
PLAYER_API void player__post_update( player_instance *player );
PLAYER_API void player__pass_gate( player_instance *player, ent_gate *gate );
PLAYER_API void player__im_gui( player_instance *player );
PLAYER_API void player__pass_gate( player_instance *player, ent_gate *gate );
PLAYER_API void player__im_gui( player_instance *player );
+PLAYER_API void player__setpos( player_instance *player, v3f pos );
PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp );
PLAYER_API void player__kill( player_instance *player );
PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp );
PLAYER_API void player__kill( player_instance *player );