X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.h;h=f1661d53c87c881c447263ecfe0ccc2d51927200;hb=a1056ed8198f0f5be0e0f341da8bd49aa6c47198;hp=c26e8459f08858b5b25d950fbf1281909a2852d1;hpb=0de25596501d8aba67b08c92bdab417d6947cd13;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_skate.h b/player_skate.h index c26e845..f1661d5 100644 --- a/player_skate.h +++ b/player_skate.h @@ -43,6 +43,8 @@ struct player_skate trick_euler; /* measured in units of TAU */ float trick_time; + + float gravity_bias; #if 0 m3x3f velocity_bias, velocity_bias_pstep; @@ -50,7 +52,6 @@ struct player_skate #endif v3f up_dir; - v3f head_position; int lift_frames; @@ -96,10 +97,16 @@ struct player_skate 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; + audio_channel *aud_main, *aud_slide, *aud_air; + enum mdl_surface_prop surface, audio_surface; + /* * Physics * ---------------------------------------------------- @@ -115,6 +122,8 @@ struct player_skate v3f apex; v3f v; + float gravity; + int log_length; float score, land_dist; @@ -129,7 +138,7 @@ struct player_skate u32 colour; } - predictions[22]; + predictions[32]; u32 prediction_count; float land_dist; v3f land_normal; @@ -161,7 +170,7 @@ VG_STATIC void player__skate_animate ( player_instance *player, player_animation *anim ); VG_STATIC void player__skate_post_animate ( player_instance *player ); VG_STATIC void player__skate_reset ( player_instance *player, - struct respawn_point *rp ); + ent_spawn *rp ); VG_STATIC void player__skate_clear_mechanics( player_instance *player ); VG_STATIC void player__skate_reset_animator( player_instance *player );