X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.c;h=33b1c1e9b8cc47cf951d4499d371f9c2481f7871;hb=b615f03b922d155f9449d2a23d3cc18eed320ed3;hp=e2052029635dc3cc40cd8a7ab036fd0461043d54;hpb=872ad3e040f22df357929d3778a955ae8c4ac52b;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.c b/player.c index e205202..33b1c1e 100644 --- a/player.c +++ b/player.c @@ -4,6 +4,9 @@ #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[] ) { @@ -32,6 +35,17 @@ VG_STATIC void player_init(void) } vg_console_reg_cmd( "respawn", localplayer_cmd_respawn, NULL ); + VG_VAR_F32( k_cam_damp ); + VG_VAR_F32( k_cam_spring ); + VG_VAR_F32( k_cam_punch ); + VG_VAR_F32( k_cam_shake_strength ); + VG_VAR_F32( k_cam_shake_trackspeed ); + VG_VAR_I32( k_player_debug_info, flags=VG_VAR_PERSISTENT ); + + vg_console_reg_var( "cinema", &k_cinema, k_var_dtype_f32, 0 ); + vg_console_reg_var( "cinema_fixed", &k_cinema_fixed, k_var_dtype_i32, 0 ); + vg_console_reg_var( "invert_y", &k_invert_y, + k_var_dtype_i32, VG_VAR_PERSISTENT ); } PLAYER_API @@ -44,8 +58,8 @@ void player__debugtext( int size, const char *fmt, ... ) vsnprintf( buffer, 1024, fmt, args ); va_end( args ); - ui_text( vg_uictx.cursor, buffer, size, k_text_align_right ); - vg_uictx.cursor[1] += 14*size; + ui_text( g_player_debugger, buffer, size, k_ui_align_left, 0 ); + g_player_debugger[1] += size*16; } /* @@ -58,72 +72,6 @@ void player__create( player_instance *inst ) assert( only_once == 0 ); only_once ++; - inst->input_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 ); @@ -149,9 +97,10 @@ void player__use_avatar( player_instance *player, struct player_avatar *av ) } PLAYER_API -void player__use_model( player_instance *player, struct player_model *mdl ) -{ - player->playermodel = mdl; +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 @@ -192,10 +141,10 @@ void player__pre_update( player_instance *player ) return; } - if( vg_input_button_down( player->input_reset ) && !player->immobile ){ - double delta = world_global.time - world_global.last_use; + if( button_down( k_srbind_reset ) && !player->immobile ){ + f64 delta = world_static.time - world_static.last_use; - if( (delta <= RESET_MAX_TIME) && (world_global.last_use != 0.0) ){ + if( (delta <= RESET_MAX_TIME) && (world_static.last_use != 0.0) ){ player->rewinding = 1; player->rewind_sound_wait = 1; player->rewind_time = (double)player->rewind_length - 0.0001; @@ -236,7 +185,7 @@ void player__pre_update( player_instance *player ) } } - if( vg_input_button_down( player->input_camera ) && !player->immobile ){ + if( button_down( k_srbind_camera ) && !player->immobile ){ if( player->camera_mode == k_cam_firstperson ) player->camera_mode = k_cam_thirdperson; else @@ -282,11 +231,11 @@ void player__post_update( player_instance *player ) PLAYER_API void player__pass_gate( player_instance *player, ent_gate *gate ) { - world_routes_fracture( get_active_world(), gate, + world_routes_fracture( world_current_instance(), gate, player->rb.co, player->rb.v ); player->gate_waiting = gate; - world_routes_activate_entry_gate( get_active_world(), gate ); + world_routes_activate_entry_gate( world_current_instance(), gate ); m4x3_mulv( gate->transport, player->tpv_lpf, player->tpv_lpf ); m3x3_mulv( gate->transport, player->cam_velocity_smooth, @@ -313,9 +262,9 @@ void player__pass_gate( player_instance *player, ent_gate *gate ) player_save_rewind_frame( player ); if( gate->type == k_gate_type_nonlocel ) - world_global.active_world = gate->target; + world_static.active_world = gate->target; - world_global.in_volume = 0; + world_volumes.inside = 0; audio_lock(); audio_oneshot( &audio_gate_pass, 1.0f, 0.0f ); @@ -356,16 +305,22 @@ VG_STATIC void gate_rotate_angles( ent_gate *gate, v3f angles, v3f d ) d[0] = atan2f( fwd_dir[2], fwd_dir[0] ); } -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; +PLAYER_API void player__im_gui( player_instance *player ){ + if( !k_player_debug_info ) return; + + 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 ) ); @@ -373,16 +328,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 ); } VG_STATIC void global_skateshop_exit(void); -PLAYER_API void player__spawn( player_instance *player, - ent_spawn *rp ) -{ - v3_copy( rp->transform.co, player->rb.co ); + +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 ); @@ -394,6 +352,11 @@ PLAYER_API void player__spawn( player_instance *player, player->subsystem = k_player_subsystem_walk; player->immobile = 0; player->gate_waiting = NULL; + player->rewind_length = 0; + player->rewind_accum = 0.0f; + player->rewind_gate = NULL; + player->rewinding = 0; + world_static.last_use = 0.0; global_skateshop_exit(); @@ -402,9 +365,18 @@ PLAYER_API void player__spawn( player_instance *player, } -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 */