projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fuckin hell
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_skate.h
diff --git
a/player_skate.h
b/player_skate.h
index e3f639a7360c6ef7577c8093043d88c73ed786f5..4c8bbd4afc83d93fdaf23e6226d41e2dce44fd21 100644
(file)
--- a/
player_skate.h
+++ b/
player_skate.h
@@
-43,11
+43,15
@@
struct player_skate
trick_euler; /* measured in units of TAU */
float trick_time;
trick_euler; /* measured in units of TAU */
float trick_time;
+
+ float gravity_bias;
+#if 0
m3x3f velocity_bias,
velocity_bias_pstep;
v3f apex;
m3x3f velocity_bias,
velocity_bias_pstep;
v3f apex;
- v3f up_dir;
+#endif
+ v3f up_dir;
v3f head_position;
int lift_frames;
v3f head_position;
int lift_frames;
@@
-60,12
+64,17
@@
struct player_skate
int charging_jump, jump_dir;
float jump_charge;
int charging_jump, jump_dir;
float jump_charge;
- double jump_time;
+ double jump_time;
double start_push,
cur_push;
v3f prev_pos;
double start_push,
cur_push;
v3f prev_pos;
+
+ /* initial launch conditions */
+ double air_start;
+ v3f air_init_v,
+ air_init_co;
}
state,
state_gate_storage;
}
state,
state_gate_storage;
@@
-88,8
+97,11
@@
struct player_skate
blend_stand,
blend_push,
blend_jump,
blend_stand,
blend_push,
blend_jump,
- blend_airdir;
+ blend_airdir,
+ blend_weight;
+ /* vectors representing the direction of the axels in localspace */
+ v3f truckv0[2];
v2f wobble;
/*
v2f wobble;
/*
@@
-105,7
+117,11
@@
struct player_skate
v3f log[50];
v3f n;
v3f apex;
v3f log[50];
v3f n;
v3f apex;
- u32 log_length;
+ v3f v;
+
+ float gravity;
+
+ int log_length;
float score,
land_dist;
float score,
land_dist;
@@
-119,14
+135,17
@@
struct player_skate
u32 colour;
}
u32 colour;
}
- predictions[
2
2];
+ predictions[
3
2];
u32 prediction_count;
float land_dist;
v3f land_normal;
v3f surface_picture,
weight_distribution,
u32 prediction_count;
float land_dist;
v3f land_normal;
v3f surface_picture,
weight_distribution,
- grind_vec;
+ grind_vec,
+ grind_dir;
+
+ u32 frames_since_activity_change;
float grind_strength;
float grind_strength;