projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prelim tricks
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_skate.h
diff --git
a/player_skate.h
b/player_skate.h
index f0efcf8ac3df169f6d911648c110968620980cba..1833062d0bef5939966d2878f461c13cd30031c6 100644
(file)
--- a/
player_skate.h
+++ b/
player_skate.h
@@
-23,10
+23,15
@@
struct player_skate
reverse,
slip;
reverse,
slip;
+ /* tricks */
v3f flip_axis;
float flip_time,
flip_rate;
v3f flip_axis;
float flip_time,
flip_rate;
+ v3f trick_vel, /* measured in units of TAU/s */
+ trick_euler; /* measured in units of TAU */
+ float trick_time;
+
m3x3f velocity_bias,
velocity_bias_pstep;
v3f apex;
m3x3f velocity_bias,
velocity_bias_pstep;
v3f apex;
@@
-82,7
+87,9
@@
struct player_skate
*anim_ollie, *anim_ollie_reverse,
*anim_grabs, *anim_stop;
rb_sphere sphere_front, sphere_back;
*anim_ollie, *anim_ollie_reverse,
*anim_grabs, *anim_stop;
rb_sphere sphere_front, sphere_back;
- v3f board_offset;
+ v3f board_offset,
+ board_trick_residualv,
+ board_trick_residuald;
v4f board_rotation;
float blend_slide,
v4f board_rotation;
float blend_slide,