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_skate.h
diff --git
a/player_skate.h
b/player_skate.h
index b529a4811cb31fb151fdc531abf3db2e4f76c7f0..9fbc5634832050bb574dbd4c37054f3b7bf59267 100644
(file)
--- a/
player_skate.h
+++ b/
player_skate.h
@@
-24,8
+24,7
@@
struct player_skate{
activity,
activity_prev;
activity,
activity_prev;
- float reverse,
- slip;
+ f32 reverse, slip, delayed_slip_dir;
int manual_direction;
int manual_direction;
@@
-37,6
+36,13
@@
struct player_skate{
v3f trick_vel, /* measured in units of TAU/s */
trick_euler; /* measured in units of TAU */
float trick_time;
v3f trick_vel, /* measured in units of TAU/s */
trick_euler; /* measured in units of TAU */
float trick_time;
+ enum trick_type{
+ k_trick_type_none,
+ k_trick_type_kickflip,
+ k_trick_type_shuvit,
+ k_trick_type_treflip
+ }
+ trick_type;
float gravity_bias;
v3f up_dir;
float gravity_bias;
v3f up_dir;
@@
-89,6
+95,7
@@
struct player_skate{
blend_jump,
blend_airdir,
blend_weight,
blend_jump,
blend_airdir,
blend_weight,
+ blend_trick_foot,
subslap;
/* vectors representing the direction of the axels in localspace */
subslap;
/* vectors representing the direction of the axels in localspace */