X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.c;h=25e4b774b8528627704c656378330addb42ef0a2;hb=9eb3de757a997becb8406417a4bf613f4cb04900;hp=01a0b526bed5eac40cc619d48c83235029ddb075;hpb=e5dfbef890431a69291a9f0a9ca4a88ea8d0705a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.c b/player.c index 01a0b52..25e4b77 100644 --- a/player.c +++ b/player.c @@ -4,6 +4,49 @@ #include "player.h" #include "camera.h" #include "player_model.h" +#include "input.h" +#include "world.h" +#include "audio.h" + +VG_STATIC int localplayer_cmd_respawn( int argc, const char *argv[] ) +{ + ent_spawn *rp = NULL, *r; + world_instance *world = localplayer.viewable_world; + + if( argc == 1 ){ + rp = world_find_spawn_by_name( world, argv[0] ); + } + else if( argc == 0 ){ + rp = world_find_closest_spawn( world, localplayer.rb.co ); + } + + if( !rp ) + return 0; + + player__spawn( &localplayer, rp ); + return 1; +} + +VG_STATIC void player_init(void) +{ + for( u32 i=0; iinput_js1h = vg_create_named_input( "steer-h", k_input_type_axis ); - inst->input_js1v = vg_create_named_input( "steer-v", k_input_type_axis ); - inst->input_grab = vg_create_named_input( "grab", k_input_type_axis_norm); - inst->input_js2h = vg_create_named_input( "grab-h", k_input_type_axis ); - inst->input_js2v = vg_create_named_input( "grab-v", k_input_type_axis ); - inst->input_jump = vg_create_named_input( "jump", k_input_type_button ); - inst->input_push = vg_create_named_input( "push", k_input_type_button ); - inst->input_walk = vg_create_named_input( "walk", k_input_type_button ); - inst->input_walkh= vg_create_named_input( "walk-h", k_input_type_axis ); - inst->input_walkv= vg_create_named_input( "walk-v", k_input_type_axis ); - inst->input_use = vg_create_named_input( "use", k_input_type_button ); - inst->input_reset= vg_create_named_input( "reset", k_input_type_button ); - inst->input_camera=vg_create_named_input( "camera", k_input_type_button ); - inst->input_trick0=vg_create_named_input( "trick0", k_input_type_button ); - inst->input_trick1=vg_create_named_input( "trick1", k_input_type_button ); - inst->input_trick2=vg_create_named_input( "trick2", k_input_type_button ); - - const char *default_cfg[] = - { - "bind steer-h gp-ls-h", - "bind -steer-h a", - "bind +steer-h d", - - "bind steer-v gp-ls-v", - "bind -steer-v w", - "bind +steer-v s", - - "bind grab gp-rt", - "bind +grab shift", - "bind grab-h gp-rs-h", - "bind grab-v gp-rs-v", - - "bind jump space", - "bind jump gp-a", - - "bind trick0 mouse1", - "bind trick0 gp-a", - "bind trick1 mouse2", - "bind trick1 gp-b", - "bind trick2 gp-x", /* keyboard: m0 + m1 */ - - "bind push gp-b", - "bind push w", - - "bind walk shift", - "bind walk gp-ls", - - "bind walk-h gp-ls-h", - "bind walk-v -gp-ls-v", - "bind +walk-h d", - "bind -walk-h a", - "bind +walk-v w", - "bind -walk-v s", - - "bind reset gp-lb", - "bind reset r", - - "bind use gp-y", - "bind use e", - "bind camera c", - "bind camera gp-rb" - }; - - for( int i=0; irb.co ); v3_zero( inst->rb.w ); v3_zero( inst->rb.v ); q_identity( inst->rb.q ); m4x3_identity( inst->rb.to_world ); m4x3_identity( inst->rb.to_local ); - - inst->rewind_length = 0; - inst->rewind_buffer = - vg_linear_alloc( vg_mem.rtmemory, - sizeof(struct rewind_frame) * PLAYER_REWIND_FRAMES ); - } /* @@ -120,22 +91,19 @@ void player__use_avatar( player_instance *player, struct player_avatar *av ) } PLAYER_API -void player__use_mesh( player_instance *player, glmesh *mesh ) -{ - player->playermesh = mesh; -} - -PLAYER_API -void player__use_texture( player_instance *player, vg_tex2d *tex ) -{ - player->playertex = tex; +void player__use_model( player_instance *player, u16 reg_id ){ + addon_cache_unwatch( k_addon_type_player, player->playermodel_view_slot ); + player->playermodel_view_slot = + addon_cache_create_viewer( k_addon_type_player, reg_id ); } PLAYER_API void player__bind( player_instance *player ) { - player__skate_bind( player ); - player__walk_bind( player ); + for( u32 i=0; irewind_length < PLAYER_REWIND_FRAMES ){ - struct rewind_frame *fr = - &player->rewind_buffer[ player->rewind_length ++ ]; - - v2_copy( player->cam.angles, fr->ang ); - v3_copy( player->cam.pos, fr->pos ); - - if( player->rewind_length >= 2 ){ - player->rewind_total_length += - v3_dist( player->rewind_buffer[player->rewind_length-1].pos, - player->rewind_buffer[player->rewind_length-2].pos ); - } - } -} - PLAYER_API -void player__pre_update( player_instance *player ) -{ - if( player->rewinding ){ - return; - } - - if( vg_input_button_down( player->input_reset ) ){ - double delta = world_global.time - world_global.last_use; - - if( (delta <= RESET_MAX_TIME) && (world_global.last_use != 0.0) ){ - player->rewinding = 1; - player->rewind_sound_wait = 1; - player->rewind_time = (double)player->rewind_length - 0.0001; - player_save_rewind_frame( player ); - - audio_lock(); - audio_oneshot( &audio_rewind[0], 1.0f, 0.0f ); - audio_unlock(); - - /* based on 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->rewind_start = vg.time; - player->subsystem = player->subsystem_gate; - player->rb = player->rb_gate_storage; - v3_copy( player->angles_storage, player->angles ); - - if( _player_restore[ player->subsystem ] ) - _player_restore[ player->subsystem ]( player ); +void player__pre_update( player_instance *player ){ + if( button_down( k_srbind_reset ) && !player->immobile ){ + if( player->subsystem == k_player_subsystem_dead ){ + localplayer_cmd_respawn( 0, NULL ); } else{ - if( player->subsystem == k_player_subsystem_dead ){ - __respawn( 0, NULL ); - } - else{ - /* cant do that */ - audio_lock(); - audio_oneshot( &audio_rewind[4], 1.0f, 0.0f ); - audio_unlock(); - } + /* cant do that */ + audio_lock(); + audio_oneshot( &audio_rewind[4], 1.0f, 0.0f ); + audio_unlock(); } } - if( vg_input_button_down( player->input_camera ) ){ - if( player->camera_mode == k_cam_firstperson ) - player->camera_mode = k_cam_thirdperson; + if( button_down( k_srbind_camera ) && !player->immobile ){ + if( player->cam_control.camera_mode == k_cam_firstperson ) + player->cam_control.camera_mode = k_cam_thirdperson; else - player->camera_mode = k_cam_firstperson; + player->cam_control.camera_mode = k_cam_firstperson; } if( _player_pre_update[ player->subsystem ] ) @@ -223,32 +137,52 @@ void player__pre_update( player_instance *player ) } PLAYER_API -void player__update( player_instance *player ) -{ - if( player->rewinding ) - return; - +void player__update( player_instance *player ){ if( _player_update[ player->subsystem ] ) _player_update[ player->subsystem ]( player ); } PLAYER_API -void player__post_update( player_instance *player ) -{ - if( player->rewinding ) - return; - +void player__post_update( player_instance *player ){ if( _player_post_update[ player->subsystem ] ) _player_post_update[ player->subsystem ]( player ); +} + +/* + * Applies gate transport to a player_interface + */ +PLAYER_API +void player__pass_gate( player_instance *player, ent_gate *gate ) +{ + world_routes_fracture( world_current_instance(), gate, + player->rb.co, player->rb.v ); - if((player->subsystem != k_player_subsystem_dead) && !player->gate_waiting){ - player->rewind_accum += vg.frame_delta; + player->gate_waiting = gate; + world_routes_activate_entry_gate( world_current_instance(), gate ); - if( player->rewind_accum > 0.25f ){ - player->rewind_accum -= 0.25f; - player_save_rewind_frame( player ); - } - } + struct player_cam_controller *cc = &player->cam_control; + m4x3_mulv( gate->transport, cc->tpv_lpf, cc->tpv_lpf ); + m3x3_mulv( gate->transport, cc->cam_velocity_smooth, + cc->cam_velocity_smooth ); + m3x3_copy( player->basis, player->basis_gate ); + + v4f q; + m3x3_q( gate->transport, q ); + q_mul( q, player->qbasis, player->qbasis ); + q_normalize( player->qbasis ); + q_m3x3( player->qbasis, player->basis ); + m3x3_transpose( player->basis, player->invbasis ); + + m4x3_mulv( gate->transport, player->cam.pos, player->cam.pos ); + + if( gate->type == k_gate_type_nonlocel ) + world_static.active_world = gate->target; + + world_volumes.inside = 0; + + audio_lock(); + audio_oneshot( &audio_gate_pass, 1.0f, 0.0f ); + audio_unlock(); } VG_STATIC void player_apply_transport_to_cam( m4x3f transport ) @@ -285,220 +219,22 @@ VG_STATIC void gate_rotate_angles( ent_gate *gate, v3f angles, v3f d ) d[0] = atan2f( fwd_dir[2], fwd_dir[0] ); } -/* - * Applies gate transport to a player_interface - */ -PLAYER_API -void player__pass_gate( player_instance *player, ent_gate *gate ) -{ - player->gate_waiting = gate; - world_routes_activate_entry_gate( get_active_world(), gate ); - - m4x3_mulv( gate->transport, player->tpv_lpf, player->tpv_lpf ); - m3x3_mulv( gate->transport, player->cam_velocity_smooth, - player->cam_velocity_smooth ); - - m3x3_copy( player->basis, player->basis_gate ); - - v4f q; - m3x3_q( gate->transport, q ); - q_mul( q, player->qbasis, player->qbasis ); - q_normalize( player->qbasis ); - q_m3x3( player->qbasis, player->basis ); - m3x3_transpose( player->basis, player->invbasis ); - - player->subsystem_gate = player->subsystem; - player->rb_gate_storage = player->rb; - v3_copy( player->angles, player->angles_storage ); - player->rewind_length = 0; - player->rewind_total_length = 0.0f; - player->rewind_gate = gate; - player->rewind_accum = 0.0f; - - m4x3_mulv( gate->transport, player->cam.pos, player->cam.pos ); - player_save_rewind_frame( player ); - - if( gate->type == k_gate_type_nonlocal ) - world_global.active_world = gate->target; - - world_global.in_volume = 0; - - audio_lock(); - audio_oneshot( &audio_gate_pass, 1.0f, 0.0f ); - audio_unlock(); -} - -VG_STATIC void player__pre_render( player_instance *player ) -{ - if( _player_animate[ player->subsystem ] ){ - player_animation res; - _player_animate[ player->subsystem ]( player, &res ); - - m4x3f transform; - q_m3x3( res.root_q, transform ); - v3_copy( res.root_co, transform[3] ); - - struct skeleton *sk = &player->playeravatar->sk; - - if( player->holdout_time > 0.0f ){ - skeleton_lerp_pose( sk, res.pose, player->holdout_pose, - player->holdout_time, res.pose ); - player->holdout_time -= vg.frame_delta * 2.0f; - } - - skeleton_apply_pose( sk, res.pose, k_anim_apply_defer_ik ); - skeleton_apply_ik_pass( sk ); - skeleton_apply_pose( sk, res.pose, k_anim_apply_deffered_only ); - skeleton_apply_inverses( sk ); - skeleton_apply_transform( sk, transform ); - - skeleton_debug( sk ); - } - - if( _player_post_animate[ player->subsystem ] ) - _player_post_animate[ player->subsystem ]( player ); - - struct player_avatar *av = player->playeravatar; - v3f vp0 = {0.0f,0.1f, 0.55f}, - vp1 = {0.0f,0.1f,-0.55f}; - - m4x3_mulv( av->sk.final_mtx[ av->id_board ], vp0, TEMP_BOARD_0 ); - m4x3_mulv( av->sk.final_mtx[ av->id_board ], vp1, TEMP_BOARD_1 ); - - if( player->rewinding ){ - if( player->rewind_time <= 0.0f ){ - double taken = vg.time - player->rewind_start; - vg_success( "Rewind took (rt, pt, tl): %f, %f, %f\n", - taken, player->rewind_predicted_time, - player->rewind_total_length ); - - player->rewinding = 0; - player->rewind_length = 1; - player->rewind_total_length = 0.0f; - player->rewind_accum = 0.0f; - world_global.sky_target_rate = 1.0; - world_global.time = world_global.last_use; - } - else{ - world_global.sky_target_rate = -100.0; - - float budget = vg.time_delta, - overall_length = player->rewind_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->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_oneshot( &audio_rewind[3], 1.0f, 0.0f ); - audio_unlock(); - player->rewind_sound_wait = 0; - } - } - else if( player->rewind_predicted_time >= 2.5f ){ - if( remaining <= 2.5f ){ - audio_lock(); - audio_oneshot( &audio_rewind[2], 1.0f, 0.0f ); - audio_unlock(); - player->rewind_sound_wait = 0; - } - } - else if( player->rewind_predicted_time >= 1.5f ){ - if( remaining <= 1.5f ){ - audio_lock(); - audio_oneshot( &audio_rewind[1], 1.0f, 0.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, player->cam_override_pos ); - player->cam_override_angles[0] = - vg_alerpf( fr->ang[0], fr1->ang[0], sub ); - player->cam_override_angles[1] = - vg_lerpf ( fr->ang[1], fr1->ang[1], sub ); - - float blend = player->rewind_time * 0.25f; - player->cam_override_strength = vg_clampf( blend, 0.0f, 1.0f ); - } - } - else player->cam_override_strength = 0.0f; - - player__cam_iterate( player ); -} - -PLAYER_API void player__render( camera *cam, player_instance *player ) -{ - shader_model_character_view_use(); - vg_tex2d_bind( player->playertex, 0 ); - shader_model_character_view_uTexMain( 0 ); - shader_model_character_view_uCamera( cam->transform[3] ); - shader_model_character_view_uPv( cam->mtx.pv ); - - world_instance *world = get_active_world(); - world_link_lighting_ub( world, _shader_model_character_view.id ); - world_bind_position_texture( world, _shader_model_character_view.id, - _uniform_model_character_view_g_world_depth, 2 ); - world_bind_light_array( world, _shader_model_character_view.id, - _uniform_model_character_view_uLightsArray, 3 ); - world_bind_light_index( world, _shader_model_character_view.id, - _uniform_model_character_view_uLightsIndex, 4 ); - - glUniformMatrix4x3fv( _uniform_model_character_view_uTransforms, - player->playeravatar->sk.bone_count, - 0, - (float *)player->playeravatar->sk.final_mtx ); - - mesh_bind( player->playermesh ); - mesh_draw( player->playermesh ); -} +PLAYER_API void player__im_gui( player_instance *player ){ + if( !k_player_debug_info ) return; -PLAYER_API void player__im_gui( player_instance *player ) -{ - vg_uictx.cursor[0] = vg.window_x - 200; - vg_uictx.cursor[1] = 0; - vg_uictx.cursor[2] = 200; - vg_uictx.cursor[3] = 200; + ui_rect box = { + vg.window_x - 300, + 0, + 300, + vg.window_y + }; - struct ui_vert *b = ui_fill_rect( vg_uictx.cursor, 0x70000000 ); + ui_fill( box, (ui_colour(k_ui_bg)&0x00ffffff)|0x50000000 ); - vg_uictx.cursor[0] = vg.window_x; + g_player_debugger[0] = box[0]; + g_player_debugger[1] = 0; + g_player_debugger[2] = 300; + g_player_debugger[3] = 16; player__debugtext( 1, "angles: " PRINTF_v3f( player->cam.angles ) ); player__debugtext( 1, "basis: " PRINTF_v4f( player->qbasis ) ); @@ -506,15 +242,19 @@ PLAYER_API void player__im_gui( player_instance *player ) if( _player_im_gui[ player->subsystem ] ) _player_im_gui[ player->subsystem ]( player ); - b[2].co[1] = vg_uictx.cursor[1]; - b[3].co[1] = vg_uictx.cursor[1]; + replay_debug_info( player ); } -PLAYER_API void player__spawn( player_instance *player, - ent_spawn *rp ) -{ - v3_copy( rp->transform.co, player->rb.co ); +VG_STATIC void global_skateshop_exit(void); + +PLAYER_API void player__setpos( player_instance *player, v3f pos ){ + v3_copy( pos, player->rb.co ); v3_zero( player->rb.v ); + rb_update_transform( &player->rb ); +} + +PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp ){ + player__setpos( player, rp->transform.co ); v3_zero( player->rb.w ); q_identity( player->rb.q ); rb_update_transform( &player->rb ); @@ -524,17 +264,29 @@ PLAYER_API void player__spawn( player_instance *player, m3x3_identity( player->invbasis ); player->subsystem = k_player_subsystem_walk; - player->viewable_world = get_active_world(); + player->immobile = 0; player->gate_waiting = NULL; + world_static.last_use = 0.0; + + global_skateshop_exit(); if( _player_reset[ player->subsystem ] ) _player_reset[ player->subsystem ]( player, rp ); } -PLAYER_API void player__kill( player_instance *player ) -{ +PLAYER_API void player__kill( player_instance *player ){ } +/* implementation */ +#include "player_common.c" +#include "player_walk.c" +#include "player_skate.c" +#include "player_dead.c" +#include "player_drive.c" +#include "player_render.c" +#include "player_ragdoll.c" +#include "player_replay.c" + #endif /* PLAYER_C */