projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forsenRun
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_skate.h
diff --git
a/player_skate.h
b/player_skate.h
index f1661d53c87c881c447263ecfe0ccc2d51927200..ee1a236e4273fe79303477c25b5e6cdcc41a91ca 100644
(file)
--- a/
player_skate.h
+++ b/
player_skate.h
@@
-5,6
+5,8
@@
#define SKATE_CCD
#define SKATE_CCD
+typedef struct jump_info jump_info;
+
struct player_skate
{
struct
struct player_skate
{
struct
@@
-12,6
+14,7
@@
struct player_skate
enum skate_activity
{
k_skate_activity_air,
enum skate_activity
{
k_skate_activity_air,
+ k_skate_activity_air_to_grind,
k_skate_activity_ground,
k_skate_activity_undefined,
k_skate_activity_grind_any,
k_skate_activity_ground,
k_skate_activity_undefined,
k_skate_activity_grind_any,
@@
-42,14
+45,7
@@
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;
-
-
float gravity_bias;
float gravity_bias;
-#if 0
- m3x3f velocity_bias,
- velocity_bias_pstep;
- v3f apex;
-#endif
v3f up_dir;
v3f head_position;
v3f up_dir;
v3f head_position;
@@
-100,6
+96,8
@@
struct player_skate
blend_airdir,
blend_weight;
blend_airdir,
blend_weight;
+ float slap;
+
/* vectors representing the direction of the axels in localspace */
v3f truckv0[2];
v2f wobble;
/* vectors representing the direction of the axels in localspace */
v3f truckv0[2];
v2f wobble;
@@
-115,7
+113,7
@@
struct player_skate
float substep,
substep_delta;
float substep,
substep_delta;
- struct
land_prediction
+ struct
jump_info
{
v3f log[50];
v3f n;
{
v3f log[50];
v3f n;
@@
-131,6
+129,7
@@
struct player_skate
enum prediction_type
{
k_prediction_none,
enum prediction_type
{
k_prediction_none,
+ k_prediction_unset,
k_prediction_land,
k_prediction_grind
}
k_prediction_land,
k_prediction_grind
}
@@
-138,8
+137,9
@@
struct player_skate
u32 colour;
}
u32 colour;
}
- predictions[32];
- u32 prediction_count;
+ possible_jumps[36];
+ u32 possible_jump_count;
+
float land_dist;
v3f land_normal;
float land_dist;
v3f land_normal;
@@
-148,7
+148,7
@@
struct player_skate
grind_vec,
grind_dir;
grind_vec,
grind_dir;
- u32
frames_since_activity_change
;
+ u32
grind_cooldown
;
float grind_strength;
float grind_strength;