X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.c;h=c478305a4d27a4ee974f467b583aff871e893623;hb=730f202673d6ceb2a5199cf244d5c0bddc064fcf;hp=0e45e996ca62efedbef1fc97d30e999b7ffe71ec;hpb=5d8b16974b3c7d1104d23df42f23e901eb01a326;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.c b/player.c index 0e45e99..c478305 100644 --- a/player.c +++ b/player.c @@ -8,9 +8,9 @@ #include "world.h" #include "audio.h" #include "player_replay.h" +#include "network.h" -VG_STATIC int localplayer_cmd_respawn( int argc, const char *argv[] ) -{ +static int localplayer_cmd_respawn( int argc, const char *argv[] ){ ent_spawn *rp = NULL, *r; world_instance *world = localplayer.viewable_world; @@ -24,15 +24,15 @@ VG_STATIC int localplayer_cmd_respawn( int argc, const char *argv[] ) if( !rp ) return 0; - player__spawn( &localplayer, rp ); + player__spawn( rp ); return 1; } -VG_STATIC void player_init(void) -{ - for( u32 i=0; isystem_register ) sys->system_register(); } vg_console_reg_cmd( "respawn", localplayer_cmd_respawn, NULL ); @@ -49,9 +49,7 @@ VG_STATIC void player_init(void) k_var_dtype_i32, VG_VAR_PERSISTENT ); } -PLAYER_API -void player__debugtext( int size, const char *fmt, ... ) -{ +static void player__debugtext( int size, const char *fmt, ... ){ char buffer[ 1024 ]; va_list args; @@ -63,47 +61,26 @@ void player__debugtext( int size, const char *fmt, ... ) g_player_debugger[1] += size*16; } -/* - * Init - */ -PLAYER_API -void player__create( player_instance *inst ) -{ - static int only_once = 0; - assert( only_once == 0 ); - only_once ++; - - v3_zero( inst->rb.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 ); -} - /* * Appearence */ -PLAYER_API -void player__use_avatar( player_instance *player, struct player_avatar *av ) -{ - player->playeravatar = av; - player_setup_ragdoll_from_avatar( &player->ragdoll, av ); +static void player__use_avatar( struct player_avatar *av ){ + localplayer.playeravatar = av; + player_setup_ragdoll_from_avatar( &localplayer.ragdoll, av ); } -PLAYER_API -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 = +static void player__use_model( u16 reg_id ){ + addon_cache_unwatch( k_addon_type_player, + localplayer.playermodel_view_slot ); + localplayer.playermodel_view_slot = addon_cache_create_viewer( k_addon_type_player, reg_id ); } -PLAYER_API -void player__bind( player_instance *player ) -{ - for( u32 i=0; ibind ) sys->bind(); } } @@ -112,60 +89,55 @@ void player__bind( player_instance *player ) * ---------------------------------------------------------------------------- */ -PLAYER_API -void player__pre_update( player_instance *player ){ - 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; +static void player__pre_update(void){ + if( button_down( k_srbind_camera ) && !localplayer.immobile ){ + if( localplayer.cam_control.camera_mode == k_cam_firstperson ) + localplayer.cam_control.camera_mode = k_cam_thirdperson; else - player->cam_control.camera_mode = k_cam_firstperson; + localplayer.cam_control.camera_mode = k_cam_firstperson; } - if( _player_pre_update[ player->subsystem ] ) - _player_pre_update[ player->subsystem ]( player ); + if( player_subsystems[ localplayer.subsystem ]->pre_update ) + player_subsystems[ localplayer.subsystem ]->pre_update(); } -PLAYER_API -void player__update( player_instance *player ){ - if( _player_update[ player->subsystem ] ) - _player_update[ player->subsystem ]( player ); +static void player__update(void){ + if( player_subsystems[ localplayer.subsystem ]->update ) + player_subsystems[ localplayer.subsystem ]->update(); } -PLAYER_API -void player__post_update( player_instance *player ){ - if( _player_post_update[ player->subsystem ] ) - _player_post_update[ player->subsystem ]( player ); +static void player__post_update(void){ + if( player_subsystems[ localplayer.subsystem ]->post_update ) + player_subsystems[ localplayer.subsystem ]->post_update(); } /* * Applies gate transport to a player_interface */ -PLAYER_API -void player__pass_gate( player_instance *player, ent_gate *gate ) -{ +static void player__pass_gate( ent_gate *gate ){ world_routes_fracture( world_current_instance(), gate, - player->rb.co, player->rb.v ); + localplayer.rb.co, localplayer.rb.v ); - player->gate_waiting = gate; + localplayer.gate_waiting = gate; world_routes_activate_entry_gate( world_current_instance(), gate ); - struct player_cam_controller *cc = &player->cam_control; + struct player_cam_controller *cc = &localplayer.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 ); + m3x3_copy( localplayer.basis, localplayer.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 ); + q_mul( q, localplayer.qbasis, localplayer.qbasis ); + q_normalize( localplayer.qbasis ); + q_m3x3( localplayer.qbasis, localplayer.basis ); + m3x3_transpose( localplayer.basis, localplayer.invbasis ); - m4x3_mulv( gate->transport, player->cam.pos, player->cam.pos ); + m4x3_mulv( gate->transport, localplayer.cam.pos, localplayer.cam.pos ); if( gate->flags & k_ent_gate_nonlocal ) - world_static.active_world = gate->target; + world_set_active_instance( gate->target ); audio_lock(); audio_oneshot( &audio_gate_pass, 1.0f, 0.0f ); @@ -174,8 +146,7 @@ void player__pass_gate( player_instance *player, ent_gate *gate ) replay_clear( &skaterift.replay ); } -VG_STATIC void player_apply_transport_to_cam( m4x3f transport ) -{ +static void player_apply_transport_to_cam( m4x3f transport ){ /* FIXME: Applies to skaterift.cam directly! */ /* Pre-emptively edit the camera matrices so that the motion vectors @@ -193,22 +164,7 @@ VG_STATIC void player_apply_transport_to_cam( m4x3f transport ) m4x4_mul( world_gates.cam.mtx.v, transport_4, world_gates.cam.mtx.v ); } -__attribute__ ((deprecated)) -VG_STATIC void gate_rotate_angles( ent_gate *gate, v3f angles, v3f d ) -{ - v3_copy( angles, d ); - return; - - v3f fwd_dir = { cosf(angles[0]), - 0.0f, - sinf(angles[0])}; - m3x3_mulv( gate->transport, fwd_dir, fwd_dir ); - - v3_copy( angles, d ); - d[0] = atan2f( fwd_dir[2], fwd_dir[0] ); -} - -PLAYER_API void player__im_gui( player_instance *player ){ +static void player__im_gui(void){ if( !k_player_debug_info ) return; ui_rect box = { @@ -225,67 +181,81 @@ PLAYER_API void player__im_gui( player_instance *player ){ g_player_debugger[2] = 300; g_player_debugger[3] = 32; - player__debugtext( 2, "world (%u)", world_static.active_world ); - player__debugtext( 1, "model version: %u", - world_current_instance()->meta.info.version ); + player__debugtext( 2, "instance #%u", world_static.active_instance ); + char buf_hub[96], + buf_client[96]; + if( world_static.addon_client ) + addon_alias_uid( &world_static.addon_client->alias, buf_client ); + else + strcpy( buf_client, "none" ); + + if( world_static.addon_hub ) + addon_alias_uid( &world_static.addon_hub->alias, buf_hub ); + else + strcpy( buf_hub, "none" ); + + player__debugtext( 1, "hub uid: %s", buf_hub ); + player__debugtext( 1, "client uid: %s", buf_client ); player__debugtext( 2, "director" ); player__debugtext( 1, "activity: %s", (const char *[]){ [k_skaterift_menu] = "menu", [k_skaterift_replay] = "replay", - [k_skaterift_skateshop] = "shop", - [k_skaterift_default] = "default" + [k_skaterift_ent_focus] = "ent_focus", + [k_skaterift_default] = "default", + [k_skaterift_respawning]= "respawning", } [skaterift.activity] ); player__debugtext( 1, "time_rate: %.4f", skaterift.time_rate ); - player__debugtext( 2, "player_instance[%p]", player ); - player__debugtext( 1, "angles: " PRINTF_v3f( player->cam.angles ) ); - player__debugtext( 1, "basis: " PRINTF_v4f( player->qbasis ) ); + player__debugtext( 2, "player" ); + player__debugtext( 1, "angles: " PRINTF_v3f( localplayer.cam.angles ) ); + player__debugtext( 1, "basis: " PRINTF_v4f( localplayer.qbasis ) ); - if( _player_im_gui[ player->subsystem ] ) - _player_im_gui[ player->subsystem ]( player ); + if( player_subsystems[ localplayer.subsystem ]->im_gui ) + player_subsystems[ localplayer.subsystem ]->im_gui(); skaterift_replay_debug_info(); } -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 ); +static void player__setpos( v3f pos ){ + v3_copy( pos, localplayer.rb.co ); + v3_zero( localplayer.rb.v ); + rb_update_transform( &localplayer.rb ); } -PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp ){ +static void player__spawn( ent_spawn *rp ){ replay_clear( &skaterift.replay ); - player__setpos( player, rp->transform.co ); - v3_zero( player->rb.w ); - q_identity( player->rb.q ); - rb_update_transform( &player->rb ); - - q_identity( player->qbasis ); - m3x3_identity( player->basis ); - m3x3_identity( player->invbasis ); - - player->subsystem = k_player_subsystem_walk; - player->immobile = 0; - player->gate_waiting = NULL; + player__setpos( rp->transform.co ); + v3_zero( localplayer.rb.w ); + q_identity( localplayer.rb.q ); + rb_update_transform( &localplayer.rb ); + + q_identity( localplayer.qbasis ); + m3x3_identity( localplayer.basis ); + m3x3_identity( localplayer.invbasis ); + + localplayer.subsystem = k_player_subsystem_walk; + localplayer.immobile = 0; + localplayer.gate_waiting = NULL; world_static.last_use = 0.0; + world_static.focused_entity = 0; + world_static.challenge_target = NULL; + world_static.challenge_timer = 0.0f; + world_entity_unfocus(); - global_skateshop_exit(); - - if( _player_reset[ player->subsystem ] ) - _player_reset[ player->subsystem ]( player, rp ); + if( player_subsystems[ localplayer.subsystem ]->reset ) + player_subsystems[ localplayer.subsystem ]->reset( rp ); } -PLAYER_API void player__kill( player_instance *player ){ - +static void player__kill(void){ } -PLAYER_API void player__begin_holdout( player_instance *player ){ - memcpy( &player->holdout_pose, &player->pose, sizeof(player->pose) ); - player->holdout_time = 1.0f; +static void player__begin_holdout(void){ + memcpy( &localplayer.holdout_pose, &localplayer.pose, + sizeof(localplayer.pose) ); + localplayer.holdout_time = 1.0f; } /* implementation */