X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=ecf595d42c51a731daecfef6b4e99bdbaf43fd5c;hb=9eb3de757a997becb8406417a4bf613f4cb04900;hp=92667821e84363b2ffda5c4134e9a6cc637c31d0;hpb=0ae443b3f6b4b753f9a2eba58da597ae8cb14b4f;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.h b/player.h index 9266782..ecf595d 100644 --- a/player.h +++ b/player.h @@ -1,607 +1,246 @@ -/* - * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved - */ - #ifndef PLAYER_H #define PLAYER_H -#define PLAYER_REWIND_FRAMES 60*4 - -#include "audio.h" -#include "common.h" -#include "world.h" -#include "skeleton.h" -#include "bvh.h" - -VG_STATIC float - k_walkspeed = 20.0f, /* no longer used */ - k_runspeed = 20.0f, - k_board_radius = 0.3f, - k_board_length = 0.45f, - k_board_allowance = 0.04f, - //k_friction_lat = 8.8f, - k_friction_lat = 12.0f, - k_friction_resistance = 0.01f, - k_max_push_speed = 16.0f, - k_push_accel = 10.0f, - k_push_cycle_rate = 8.0f, - k_steer_ground = 2.5f, - k_steer_air = 3.6f, - k_steer_air_lerp = 0.3f, - k_pump_force = 0.0f, - k_downforce = 5.0f, - k_walk_downforce = 8.0f, - k_jump_charge_speed = (1.0f/1.0f), - k_jump_force = 5.0f, - k_pitch_limit = 1.5f, - k_look_speed = 2.0f, - k_walk_accel = 150.0f, - k_walk_friction = 8.0f; - -VG_STATIC int cl_playermdl_id = 0; -VG_STATIC int freecam = 0; -VG_STATIC int walk_grid_iterations = 1; -VG_STATIC float fc_speed = 10.0f; - -/* - * ----------------------------------------------------------------------------- - * Memory - * ----------------------------------------------------------------------------- - */ - -VG_STATIC struct gplayer -{ - /* Physics */ - rigidbody collide_front, collide_back; - - struct player_phys - { - rigidbody rb, rb_gate_frame; - float iY, siY; /* Yaw inertia */ +#include "skaterift.h" - v3f a, v_last, m, bob, vl; - - /* Utility */ - float vswitch, slip, slip_last, - reverse; - - float grab, jump, pushing, push_time; - double start_push; - int in_air, on_board, jump_charge, jump_dir; +enum player_subsystem{ + k_player_subsystem_walk = 0, + k_player_subsystem_skate = 1, + k_player_subsystem_dead = 2, + k_player_subsystem_drive = 3 +}; - m3x3f vr,vr_pstep; - } - phys, - phys_gate_frame; - - m4x3f visual_transform, - inv_visual_transform; - - int is_dead, death_tick_allowance, rewinding; - int rewind_sound_wait; - - v3f land_target; - v3f land_target_log[22]; - u32 land_target_colours[22]; - int land_log_count; - - v3f handl_target, handr_target, - handl, handr; - - /* Camera */ - float air_blend; - float air_time; - - v3f camera_pos, smooth_localcam; - v2f angles; - - struct rewind_frame - { - v3f pos; - v2f ang; +struct player_cam_controller { + enum camera_mode{ + k_cam_firstperson = 1, + k_cam_thirdperson = 0 } - *rewind_buffer; - u32 rewind_incrementer, - rewind_length; - - float rewind_time, rewind_total_length, rewind_predicted_time; - double diag_rewind_start, diag_rewind_time; - float dist_accum; - - /* animation */ - double jump_time; - float fslide, - fdirz, fdirx, - fstand, - ffly, - fpush, - fairdir, - fsetup, - walk_timer, - fjump, - fonboard, - frun; - - float walk; - int step_phase; - enum mdl_surface_prop surface_prop; - - /* player model */ - struct player_model - { - glmesh player_meshes[3]; - - mdl_context meta; - struct skeleton sk; - struct skeleton_anim *anim_stand, - *anim_highg, - *anim_slide, - *anim_air, - *anim_push, *anim_push_reverse, - *anim_ollie, *anim_ollie_reverse, - *anim_grabs, *anim_stop, - *anim_walk, *anim_run, *anim_idle, - *anim_jump; - - u32 id_hip, - id_ik_hand_l, - id_ik_hand_r, - id_ik_elbow_l, - id_ik_elbow_r, - id_head; - - v3f cam_pos; - - struct ragdoll_part - { - u32 bone_id; - v3f offset; - - u32 use_limits; - v3f limits[2]; - - rigidbody rb; - u32 parent; - } - ragdoll[32]; - u32 ragdoll_count; - - int shoes[2]; - } - mdl; -} -player = -{ - .collide_front = { .type = k_rb_shape_sphere, .inf.sphere.radius = 0.3f }, - .collide_back = { .type = k_rb_shape_sphere, .inf.sphere.radius = 0.3f } + camera_mode; + f32 camera_type_blend; + + v3f fpv_offset, /* expressed relative to rigidbody */ + tpv_offset, + tpv_offset_extra, + fpv_viewpoint, /* expressed relative to neck bone inverse final*/ + fpv_offset_smooth, + fpv_viewpoint_smooth, + tpv_offset_smooth, + tpv_lpf, + cam_velocity_smooth; }; -/* - * API - */ -VG_STATIC float *player_get_pos(void); -VG_STATIC void player_kill(void); -VG_STATIC float *player_cam_pos(void); -VG_STATIC void player_save_frame(void); -VG_STATIC void player_restore_frame(void); -VG_STATIC void player_save_rewind_frame(void); - -/* - * Submodules - */ -#include "player_physics.h" #include "player_ragdoll.h" +#include "player_render.h" #include "player_model.h" -#include "player_animation.h" -#include "player_audio.h" +#include "player_common.h" +#include "player_walk.h" +#include "player_skate.h" +#include "player_dead.h" +#include "player_drive.h" +#include "player_replay.h" -/* - * ----------------------------------------------------------------------------- - * Events - * ----------------------------------------------------------------------------- +#define PLAYER_REWIND_FRAMES 60*4 +#define RESET_MAX_TIME 45.0 + +static i32 k_cinema_fixed = 0; +static f32 k_cinema = 0.0f; +static i32 k_invert_y = 0; + +struct player_instance{ + /* transform definition */ + rigidbody rb; + v3f angles; + + v4f qbasis; + m3x3f basis, invbasis, basis_gate; + world_instance *viewable_world; + + /* + * Camera management + * --------------------------- + */ + camera cam; + struct player_cam_controller cam_control; + + v3f cam_override_pos; + v3f cam_override_angles; + float cam_override_fov; + float cam_override_strength; + f32 cam_trackshake; + + float cam_velocity_influence, + cam_velocity_coefficient, + cam_velocity_constant, + cam_velocity_coefficient_smooth, + cam_velocity_constant_smooth, + cam_velocity_influence_smooth; + + v3f cam_land_punch, cam_land_punch_v; + ent_gate *gate_waiting; + + int immobile; + + /* + * Animation + * -------------------------------------------------- + */ + + struct player_avatar *playeravatar; + struct player_ragdoll ragdoll; + struct player_model fallback_model; + + u16 board_view_slot, playermodel_view_slot; + + player_pose holdout_pose; + float holdout_time; + + struct board_pose board_pose; + + /* + * Replay + * ------------------------------------------------- + */ + replay_buffer replay; + + /* + * Subsystems + * ------------------------------------------------- + */ + + enum player_subsystem subsystem; /* .. prev */ + + struct player_skate _skate; + struct player_walk _walk; + struct player_dead _dead; + struct player_drive _drive; +} +static localplayer; + +/* + * Gameloop tables + * --------------------------------------------------------- */ -VG_STATIC void player_init(void) /* 1 */ +VG_STATIC +void (*_player_system_register[])(void) = { - rb_init( &player.phys.rb ); - rb_init( &player.collide_front ); - rb_init( &player.collide_back ); - - vg_convar_push( (struct vg_convar){ - .name = "cl_playermdl_id", - .data = &cl_playermdl_id, - .data_type = k_convar_dtype_i32, - .opt_i32 = { .min=0, .max=2, .clamp=1 }, - .persistent = 1 - }); - - vg_convar_push( (struct vg_convar){ - .name = "walk_speed", - .data = &k_walkspeed, - .data_type = k_convar_dtype_f32, - .opt_f32 = { .clamp = 0 }, - .persistent = 1 - }); - - vg_convar_push( (struct vg_convar){ - .name = "run_speed", - .data = &k_runspeed, - .data_type = k_convar_dtype_f32, - .opt_f32 = { .clamp = 0 }, - .persistent = 1 - }); - - vg_convar_push( (struct vg_convar){ - .name = "walk_accel", - .data = &k_walk_accel, - .data_type = k_convar_dtype_f32, - .opt_f32 = { .clamp = 0 }, - .persistent = 1 - }); - - vg_convar_push( (struct vg_convar){ - .name = "fc", - .data = &freecam, - .data_type = k_convar_dtype_i32, - .opt_i32 = { .min=0, .max=1, .clamp=1 }, - .persistent = 1 - }); - - vg_convar_push( (struct vg_convar){ - .name = "fcs", - .data = &fc_speed, - .data_type = k_convar_dtype_f32, - .opt_f32 = { .clamp = 0 }, - .persistent = 1 - }); - - vg_function_push( (struct vg_cmd){ - .name = "reset", - .function = reset_player - }); - - player.rewind_length = 0; - player.rewind_buffer = - vg_linear_alloc( vg_mem.rtmemory, - sizeof(struct rewind_frame) * PLAYER_REWIND_FRAMES ); - - player_model_init(); -} + player__walk_register, + player__skate_register, + NULL, + NULL +}; -VG_STATIC void player_save_rewind_frame(void) +VG_STATIC +void (*_player_bind[])( player_instance *player ) = { - if( player.rewind_length < PLAYER_REWIND_FRAMES ) - { - struct rewind_frame *fr = - &player.rewind_buffer[ player.rewind_length ++ ]; - - v2_copy( player.angles, fr->ang ); - v3_copy( player.camera_pos, fr->pos ); - - player.rewind_incrementer = 0; - - if( player.rewind_length > 1 ) - { - player.rewind_total_length += - v3_dist( player.rewind_buffer[player.rewind_length-1].pos, - player.rewind_buffer[player.rewind_length-2].pos ); - } - } -} + player__walk_bind, + player__skate_bind, + NULL, + player__drive_bind +}; -/* Deal with input etc */ -VG_STATIC void player_update_pre(void) +VG_STATIC +void (*_player_reset[])( player_instance *player, ent_spawn *rp ) = { - struct player_phys *phys = &player.phys; - - if( player.rewinding ) - { - return; - } - - if( vg_get_button_down( "reset" ) ) - { - if( player.is_dead ) - { - reset_player( 0, NULL ); - audio_lock(); - audio_play_oneshot( &audio_ui[0], 1.0f ); - audio_unlock(); - } - else - { - double delta = world.time - world.last_use; - - if( (delta <= RESET_MAX_TIME) && (world.last_use != 0.0) ) - { - player.rewinding = 1; - player.rewind_sound_wait = 1; - player.rewind_time = (float)player.rewind_length - 0.0001f; - player_save_rewind_frame(); - audio_lock(); - audio_play_oneshot( &audio_rewind[0], 1.0f ); - audio_unlock(); - - /* based on analytical testing. DONT CHANGE! - * - * time taken: y = (x^(4/5)) * 74.5 - * inverse : x = (2/149)^(4/5) * y^(4/5) - */ - - float constant = powf( 2.0f/149.0f, 4.0f/5.0f ), - curve = powf( player.rewind_total_length, 4.0f/5.0f ); - - player.rewind_predicted_time = constant * curve; - player.diag_rewind_start = vg.time; - player.diag_rewind_time = player.rewind_time; - - player.is_dead = 0; - player.death_tick_allowance = 30; - player_restore_frame(); - - if( !phys->on_board ) - { - player.angles[0] = atan2f( -phys->rb.forward[2], - -phys->rb.forward[0] ); - } - - player.mdl.shoes[0] = 1; - player.mdl.shoes[1] = 1; - - world_routes_notify_reset(); - - /* apply 1 frame of movement */ - player_do_motion(); - } - else - { - /* cant do that */ - audio_lock(); - audio_play_oneshot( &audio_rewind[4], 1.0f ); - audio_unlock(); - } - } - } - - if( vg_get_button_down( "switchmode" ) ) - { - phys->on_board ^= 0x1; - - audio_lock(); - if( phys->on_board ) - { - v3_muladds( phys->rb.v, phys->rb.forward, 0.2f, phys->rb.v ); - audio_play_oneshot( &audio_lands[6], 1.0f ); - } - else - { - audio_play_oneshot( &audio_lands[5], 1.0f ); - } - - audio_unlock(); - } -} + player__walk_reset, + player__skate_reset, + NULL, + player__drive_reset +}; -VG_STATIC void player_update_fixed(void) /* 2 */ +VG_STATIC +void (*_player_pre_update[])( player_instance *player ) = { - if( player.rewinding ) - return; - - if( player.death_tick_allowance ) - player.death_tick_allowance --; - - struct player_phys *phys = &player.phys; - - if( player.is_dead ) - { - player_ragdoll_iter(); - } - else - { - player.rewind_incrementer ++; - - if( player.rewind_incrementer > (u32)(0.25/VG_TIMESTEP_FIXED) ) - { - player_save_rewind_frame(); - } - - player_do_motion(); - } -} + player__walk_pre_update, + player__skate_pre_update, + NULL, + player__drive_pre_update +}; -VG_STATIC void player_update_post(void) +VG_STATIC +void( *_player_update[])( player_instance *player ) = { - for( int i=0; i 0 ); - - v2f override_angles; - v3f override_pos; - - float budget = vg.time_delta, - overall_length = player.rewind_length; - - world_routes_rollback_time( player.rewind_time / overall_length ); - - for( int i=0; (i<10)&&(player.rewind_time>0.0f)&&(budget>0.0f); i ++ ) - { - /* Interpolate frames */ - int i0 = floorf( player.rewind_time ), - i1 = VG_MIN( i0+1, player.rewind_length-1 ); - - struct rewind_frame *fr = &player.rewind_buffer[i0], - *fr1 = &player.rewind_buffer[i1]; - - float dist = vg_maxf( v3_dist( fr->pos, fr1->pos ), 0.001f ), - subl = vg_fractf( player.rewind_time ) + 0.001f, - - sramp= 3.0f-(1.0f/(0.4f+0.4f*player.rewind_time)), - speed = sramp*28.0f + 0.5f*player.rewind_time, - mod = speed * (budget / dist), - - advl = vg_minf( mod, subl ), - advt = (advl / mod) * budget; - - player.dist_accum += speed * advt; - player.rewind_time -= advl; - budget -= advt; - } - - player.rewind_time = vg_maxf( 0.0f, player.rewind_time ); - - float current_time = vg.time - player.diag_rewind_start, - remaining = player.rewind_predicted_time - current_time; - - if( player.rewind_sound_wait ) - { - if( player.rewind_predicted_time >= 6.5f ) - { - if( remaining <= 6.5f ) - { - audio_lock(); - audio_play_oneshot( &audio_rewind[3], 1.0f ); - audio_unlock(); - player.rewind_sound_wait = 0; - } - } - else if( player.rewind_predicted_time >= 2.5f ) - { - if( remaining <= 2.5f ) - { - audio_lock(); - audio_play_oneshot( &audio_rewind[2], 1.0f ); - audio_unlock(); - player.rewind_sound_wait = 0; - } - } - else if( player.rewind_predicted_time >= 1.5f ) - { - if( remaining <= 1.5f ) - { - audio_lock(); - audio_play_oneshot( &audio_rewind[1], 1.0f ); - audio_unlock(); - player.rewind_sound_wait = 0; - } - } - - - } - - int i0 = floorf( player.rewind_time ), - i1 = VG_MIN( i0+1, player.rewind_length-1 ); - - struct rewind_frame *fr = &player.rewind_buffer[i0], - *fr1 = &player.rewind_buffer[i1]; - - float sub = vg_fractf(player.rewind_time); - - v3_lerp( fr->pos, fr1->pos, sub, override_pos ); - override_angles[0] = vg_alerpf( fr->ang[0], fr1->ang[0], sub ); - override_angles[1] = vg_lerpf ( fr->ang[1], fr1->ang[1], sub ); - - /* CAMERA POSITIONING: LAYER 1 */ - float blend = (4.0f-player.rewind_time) * 0.25f, - c = vg_clampf( blend, 0.0f, 1.0f ); - - camera_angles[0] = vg_alerpf(override_angles[0], player.angles[0], c); - camera_angles[1] = vg_lerpf (override_angles[1], player.angles[1], c); - v3_lerp( override_pos, player.camera_pos, c, camera_pos ); - } - } + player__walk_update, + player__skate_update, + player__dead_update, + player__drive_update +}; - camera_update(); - player_audio(); -} +VG_STATIC +void( *_player_post_update[])( player_instance *player ) = +{ + player__walk_post_update, + player__skate_post_update, + NULL, + player__drive_post_update +}; -VG_STATIC void draw_player( m4x3f cam ) +VG_STATIC +void( *_player_im_gui[])( player_instance *player ) = { - if( player.is_dead ) - player_model_copy_ragdoll(); - - shader_viewchar_use(); - vg_tex2d_bind( &tex_characters, 0 ); - shader_viewchar_uTexMain( 0 ); - shader_viewchar_uCamera( cam[3] ); - shader_viewchar_uPv( vg.pv ); - shader_link_standard_ub( _shader_viewchar.id, 2 ); - glUniformMatrix4x3fv( _uniform_viewchar_uTransforms, - player.mdl.sk.bone_count, - 0, - (float *)player.mdl.sk.final_mtx ); - - mesh_bind( &player.mdl.player_meshes[cl_playermdl_id] ); - mesh_draw( &player.mdl.player_meshes[cl_playermdl_id] ); -} + player__walk_im_gui, + player__skate_im_gui, + NULL, + player__drive_im_gui +}; -/* - * ----------------------------------------------------------------------------- - * API implementation - * ----------------------------------------------------------------------------- - */ +VG_STATIC +void( *_player_animate[])( player_instance *player, player_animation *dest ) = +{ + player__walk_animate, + player__skate_animate, + player__dead_animate, + player__drive_animate +}; -VG_STATIC float *player_get_pos(void) +VG_STATIC +void( *_player_post_animate[])( player_instance *player ) = { - return player.phys.rb.co; -} + player__walk_post_animate, + player__skate_post_animate, + player__dead_post_animate, + player__drive_post_animate +}; -VG_STATIC void player_kill(void) +VG_STATIC +void( *_player_store_state[] )( player_instance *player ) = { - if( player.death_tick_allowance == 0 ) - { - player.is_dead = 1; - player_ragdoll_copy_model( player.phys.rb.v ); - world_routes_clear(); - } -} + NULL, + NULL, + NULL, + NULL +}; -VG_STATIC float *player_cam_pos(void) +VG_STATIC +void( *_player_load_state_lerp[] )( player_instance *player, + void *A, void *B, f32 t ) = { - return player.camera_pos; -} + NULL, + NULL, + NULL, + NULL +}; +PLAYER_API void player__debugtext( int size, const char *fmt, ... ); +PLAYER_API void player__create( player_instance *inst ); +PLAYER_API void player__use_avatar( player_instance *player, + struct player_avatar *av ); +PLAYER_API void player__use_mesh( player_instance *player, glmesh *mesh ); +PLAYER_API void player__use_texture( player_instance *player, vg_tex2d *tex ); +PLAYER_API void player__use_model( player_instance *player, u16 reg_id ); + +PLAYER_API void player__bind( player_instance *player ); +PLAYER_API void player__pre_update( player_instance *player ); +PLAYER_API void player__update( player_instance *player ); +PLAYER_API void player__post_update( player_instance *player ); + +PLAYER_API void player__pass_gate( player_instance *player, ent_gate *gate ); +PLAYER_API void player__im_gui( player_instance *player ); +PLAYER_API void player__setpos( player_instance *player, v3f pos ); +PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp ); +PLAYER_API void player__kill( player_instance *player ); + +VG_STATIC int localplayer_cmd_respawn( int argc, const char *argv[] ); +VG_STATIC void player_apply_transport_to_cam( m4x3f transport ); #endif /* PLAYER_H */