X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.c;h=9938de6507c7aa7963e32906424c6c32b051963c;hb=ce0205fd929e5fb1446f8c52fcab344884d82569;hp=a5eaa0849f95f347b4e916b9819190cf72055eb2;hpb=fdd41609e59c7df548682b25001f0015dc1acbea;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.c b/player.c
index a5eaa08..9938de6 100644
--- a/player.c
+++ b/player.c
@@ -7,9 +7,11 @@
 #include "input.h"
 #include "world.h"
 #include "audio.h"
+#include "player_replay.h"
+#include "network.h"
+#include "network_common.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;
 
@@ -23,15 +25,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; i<vg_list_size(_player_system_register); i++ ){
-      if( _player_system_register[i] )
-         _player_system_register[i]();
+static void player_init(void){
+   for( u32 i=0; i<vg_list_size(player_subsystems); i++ ){
+      struct player_subsystem_interface *sys = player_subsystems[i];
+
+      if( sys->system_register ) sys->system_register();
    }
 
    vg_console_reg_cmd( "respawn", localplayer_cmd_respawn, NULL );
@@ -40,6 +42,7 @@ VG_STATIC void player_init(void)
    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 );
@@ -47,10 +50,7 @@ VG_STATIC void player_init(void)
                         k_var_dtype_i32, VG_VAR_PERSISTENT );
 }
 
-PLAYER_API
-void player__debugtext( int size, const char *fmt, ... )
-{
-#if 0
+static void player__debugtext( int size, const char *fmt, ... ){
 	char buffer[ 1024 ];
 
    va_list args;
@@ -58,59 +58,30 @@ 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;
-#endif
-}
-
-/*
- * 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 );
-
-   inst->rewind_length = 0;
-   inst->rewind_buffer = 
-      vg_linear_alloc( vg_mem.rtmemory, 
-                       sizeof(struct rewind_frame) * PLAYER_REWIND_FRAMES );
-
+   ui_text( g_player_debugger, buffer, size, k_ui_align_left, 0 );
+   g_player_debugger[1] += size*16;
 }
 
 /* 
  * 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 );
 }
 
-#if 0
-PLAYER_API
-void player__use_model( player_instance *player, struct player_model *mdl )
-{
-   player->playermodel = mdl;
+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 );
 }
-#endif
-
-PLAYER_API
-void player__bind( player_instance *player )
-{
-   for( u32 i=0; i<vg_list_size(_player_bind); i++ ){
-      if( _player_bind[i] )
-         _player_bind[i]( player );
+
+static void player__bind(void){
+   for( u32 i=0; i<vg_list_size(player_subsystems); i++ ){
+      struct player_subsystem_interface *sys = player_subsystems[i];
+
+      if( sys->bind ) sys->bind();
    }
 }
 
@@ -119,163 +90,73 @@ void player__bind( player_instance *player )
  * ----------------------------------------------------------------------------
  */
 
-VG_STATIC void player_save_rewind_frame( player_instance *player )
-{
-   if( player->rewind_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( button_down( k_srbind_reset ) && !player->immobile ){
-      f64 delta = world_static.time - world_static.last_use;
-
-      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;
-         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 );
-      }
-      else{
-         if( player->subsystem == k_player_subsystem_dead ){
-            localplayer_cmd_respawn( 0, NULL );
-         }
-         else{
-            /* cant do that */
-            audio_lock();
-            audio_oneshot( &audio_rewind[4], 1.0f, 0.0f );
-            audio_unlock();
-         }
-      }
-   }
-
-   if( button_down( k_srbind_camera ) && !player->immobile ){
-      if( player->camera_mode == k_cam_firstperson )
-         player->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->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->rewinding )
-      return;
-
-   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->rewinding )
-      return;
-
-   if( _player_post_update[ player->subsystem ] )
-      _player_post_update[ player->subsystem ]( player );
-
-   if((player->subsystem != k_player_subsystem_dead) && !player->gate_waiting){
-      player->rewind_accum += vg.time_frame_delta;
-
-      if( player->rewind_accum > 0.25f ){
-         player->rewind_accum -= 0.25f;
-         player_save_rewind_frame( 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 )
-{
-   world_routes_fracture( world_current_instance(), gate, 
-                          player->rb.co, player->rb.v );
+static void player__pass_gate( u32 id ){
+   world_instance *world = world_current_instance();
 
-   player->gate_waiting = gate;
-   world_routes_activate_entry_gate( world_current_instance(), gate );
+   /* update boundary hash (network animation) */
+   u16 index = mdl_entity_id_id(id) & ~NETMSG_BOUNDARY_MASK;
+   localplayer.boundary_hash ^= NETMSG_GATE_BOUNDARY_BIT;
+   localplayer.boundary_hash &= ~NETMSG_BOUNDARY_MASK;
+   localplayer.boundary_hash |= index;
 
-   m4x3_mulv( gate->transport, player->tpv_lpf, player->tpv_lpf );
-   m3x3_mulv( gate->transport, player->cam_velocity_smooth, 
-                               player->cam_velocity_smooth );
+   ent_gate *gate = mdl_arritm( &world->ent_gate, mdl_entity_id_id(id) );
+   world_routes_fracture( world, gate, localplayer.rb.co, localplayer.rb.v );
 
-   m3x3_copy( player->basis, player->basis_gate );
+   localplayer.gate_waiting = gate;
+   world_routes_activate_entry_gate( world_current_instance(), gate );
+
+   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( 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 );
-
-   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;
+   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 );
-   player_save_rewind_frame( player );
+   m4x3_mulv( gate->transport, localplayer.cam.pos, localplayer.cam.pos );
 
-   if( gate->type == k_gate_type_nonlocel )
-      world_static.active_world = gate->target;
-
-   world_volumes.inside = 0;
+   if( gate->flags & k_ent_gate_nonlocal )
+      world_set_active_instance( gate->target );
 
    audio_lock();
    audio_oneshot( &audio_gate_pass, 1.0f, 0.0f );
    audio_unlock();
+
+   replay_clear( &skaterift.replay );
 }
 
-VG_STATIC void player_apply_transport_to_cam( m4x3f transport )
-{
-   /* FIXME: Applies to main_camera directly! */
+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 
     * are correct */
@@ -283,86 +164,159 @@ VG_STATIC void player_apply_transport_to_cam( m4x3f transport )
    m4x4f transport_4;
    m4x3_invert_affine( transport, transport_i );
    m4x3_expand( transport_i, transport_4 );
-   m4x4_mul( main_camera.mtx.pv, transport_4, main_camera.mtx.pv );
-   m4x4_mul( main_camera.mtx.v,  transport_4, main_camera.mtx.v );
+   m4x4_mul( skaterift.cam.mtx.pv, transport_4, skaterift.cam.mtx.pv );
+   m4x4_mul( skaterift.cam.mtx.v,  transport_4, skaterift.cam.mtx.v );
 
    /* we want the regular transform here no the inversion */
    m4x3_expand( transport, transport_4 );
-   m4x4_mul( gate_camera.mtx.pv, transport_4, gate_camera.mtx.pv );
-   m4x4_mul( gate_camera.mtx.v,  transport_4, gate_camera.mtx.v );
+   m4x4_mul( world_gates.cam.mtx.pv, transport_4, world_gates.cam.mtx.pv );
+   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;
+static void player__im_gui(void){
+   if( !k_player_debug_info ) return;
+
+   ui_rect box = {
+      vg.window_x - 300,
+      0, 
+      300,
+      vg.window_y
+   };
+
+   ui_fill( box, (ui_colour(k_ui_bg)&0x00ffffff)|0x50000000 );
+
+   g_player_debugger[0] = box[0];
+   g_player_debugger[1] = 0;
+   g_player_debugger[2] = 300;
+   g_player_debugger[3] = 32;
+
+   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_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" );
+   player__debugtext( 1, "angles: " PRINTF_v3f( localplayer.cam.angles ) );
+   player__debugtext( 1, "basis:  " PRINTF_v4f( localplayer.qbasis ) );
+
+   if( player_subsystems[ localplayer.subsystem ]->im_gui )
+      player_subsystems[ localplayer.subsystem ]->im_gui();
+
+   skaterift_replay_debug_info();
+}
 
-   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] );
+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__im_gui( player_instance *player )
-{
-#if 0
-   vg_uictx.cursor[0] = vg.window_x - 200;
-   vg_uictx.cursor[1] = 0;
-   vg_uictx.cursor[2] = 200;
-   vg_uictx.cursor[3] = 200;
+static void player__spawn( ent_spawn *rp ){
+   replay_clear( &skaterift.replay );
+   player__setpos( rp->transform.co );
+   v3_zero( localplayer.rb.w );
+   q_identity( localplayer.rb.q );
+   rb_update_transform( &localplayer.rb );
 
-   struct ui_vert *b = ui_fill_rect( vg_uictx.cursor, 0x70000000 );
+   q_identity( localplayer.qbasis );
+   m3x3_identity( localplayer.basis );
+   m3x3_identity( localplayer.invbasis );
 
-   vg_uictx.cursor[0] = vg.window_x;
-
-   player__debugtext( 1, "angles: " PRINTF_v3f( player->cam.angles ) );
-   player__debugtext( 1, "basis:  " PRINTF_v4f( player->qbasis ) );
+   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();
 
-   if( _player_im_gui[ player->subsystem ] )
-      _player_im_gui[ player->subsystem ]( player );
+   if( player_subsystems[ localplayer.subsystem ]->reset )
+      player_subsystems[ localplayer.subsystem ]->reset( rp );
 
-   b[2].co[1] = vg_uictx.cursor[1];
-   b[3].co[1] = vg_uictx.cursor[1];
-#endif
+   localplayer.boundary_hash ^= NETMSG_BOUNDARY_BIT;
 }
 
-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 );
-   v3_zero( player->rb.v );
-   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->rewind_length = 0;
-   player->rewind_accum = 0.0f;
-   player->rewind_gate = NULL;
-   player->rewinding = 0;
-   world_static.last_use = 0.0;
 
-   global_skateshop_exit();
+static void player__kill(void){
+}
+
+static void player__begin_holdout(void){
+   memcpy( &localplayer.holdout_pose, &localplayer.pose, 
+            sizeof(localplayer.pose) );
+   localplayer.holdout_time = 1.0f;
+}
 
-   if( _player_reset[ player->subsystem ] )
-      _player_reset[ player->subsystem ]( player, rp );
+static void net_sfx_exchange( bitpack_ctx *ctx, struct net_sfx *sfx ){
+   bitpack_bytes( ctx, 1, &sfx->system );
+   bitpack_bytes( ctx, 1, &sfx->priority );
+   bitpack_bytes( ctx, 1, &sfx->id );
+   bitpack_qf32( ctx, 8, 0.0f, 1.0f, &sfx->subframe );
+   bitpack_qf32( ctx, 8, 0.0f, 1.0f, &sfx->volume );
+   bitpack_qv3f( ctx, 16, -1024.0f, 1024.0f, sfx->location );
 }
 
+static void net_sfx_play( struct net_sfx *sfx ){
+   if( sfx->system < k_player_subsystem_max ){
+      struct player_subsystem_interface *sys = player_subsystems[sfx->system];
+      if( sys->sfx_oneshot ){
+         sys->sfx_oneshot( sfx->id, sfx->location, sfx->volume );
+      }
+   }
+};
+
+static void player__networked_sfx( u8 system, u8 priority, u8 id, 
+                                   v3f pos, f32 volume ){
+   struct net_sfx null, *sfx = &null;
+
+   if( localplayer.sfx_buffer_count < vg_list_size(localplayer.sfx_buffer) )
+      sfx = &localplayer.sfx_buffer[ localplayer.sfx_buffer_count ++ ];
+   else {
+      for( u32 i=0; i<vg_list_size(localplayer.sfx_buffer); i++ ){
+         struct net_sfx *a = &localplayer.sfx_buffer[i];
+         if( a->priority < priority ){
+            sfx = a;
+            break;
+         }
+      }
+   }
+
+   sfx->id = id;
+   sfx->priority = priority;
+   sfx->volume = volume;
+   v3_copy( pos, sfx->location );
+   sfx->system = system;
+
+   f32 t = (vg.time_real - network_client.last_frame) / NETWORK_FRAMERATE;
+   sfx->subframe = vg_clampf( t, 0.0f, 1.0f );
+
+   net_sfx_play( sfx );
+}
 
-PLAYER_API void player__kill( player_instance *player )
-{
-   
+static void player__clear_sfx_buffer(void){
+   localplayer.sfx_buffer_count = 0;
 }
 
 /* implementation */
@@ -373,5 +327,6 @@ PLAYER_API void player__kill( player_instance *player )
 #include "player_drive.c"
 #include "player_render.c"
 #include "player_ragdoll.c"
+#include "player_replay.c"
 
 #endif /* PLAYER_C */