oneshot synchronization

[carveJwlIkooP6JGAAIwe30JlM.git] / player_remote.c

diff --git a/player_remote.c b/player_remote.c
index 73ed42ce3a7f4e9f0a2c4544671aaaff61e914a5..9a753944e899c19189f768d4d69ac7da85cf76ed 100644 (file)
--- a/player_remote.c
+++ b/player_remote.c
@@ -151,13 +151,68 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
       }
 
       dest->active = 1;
-      dest->timestamp = frame->timestamp;
       dest->subsystem = frame->subsystem;
       dest->instance_id = frame->instance_id;
+
+      bitpack_ctx ctx = {
+         .mode = k_bitpack_decompress,
+         .buffer = frame->animdata,
+         .buffer_len = datasize,
+         .bytes = 0,
+      };
+         
+
+      /* sfx
+       * -------------------------------------------------------------*/
+      
+      for( u32 i=0; i<frame->sound_effects; i ++ ){
+         struct net_sfx sfx;
+         net_sfx_exchange( &ctx, &sfx );
+
+         f64 t = (frame->timestamp - NETWORK_FRAMERATE) + 
+                 (sfx.subframe*NETWORK_FRAMERATE);
+
+         f32 remaining = t - ib->t;
+
+         if( remaining <= 0.0f )
+            net_sfx_play( &sfx );
+         else{
+            struct net_sfx *dst = NULL;
+
+            for( u32 j=0; j<NETWORK_SFX_QUEUE_LENGTH; j ++ ){
+               struct net_sfx *sj = &netplayers.sfx_queue[j];
+               if( sj->system == k_player_subsystem_invalid ){
+                  dst = sj;
+                  break;
+               }
+
+               if( sj->priority < sfx.priority )
+                  dst = sj;
+            }
+
+            *dst = sfx;
+            dst->subframe = remaining;
+         }
+      }
+      
+      /* animation 
+       * -------------------------------------------------------------*/
+
+      dest->timestamp = frame->timestamp;
       dest->boundary_hash = frame->boundary_hash;
 
       struct network_player *player = &netplayers.list[ frame->client ];
-      memcpy( &dest->data, frame->animdata, datasize );
+      struct player_subsystem_interface *sys = 
+         player_subsystems[ frame->subsystem ];
+
+      if( sys->network_animator_exchange ){
+         memset( &dest->data, 0, sys->animator_size );
+         sys->network_animator_exchange( &ctx, &dest->data );
+      }
+      else {
+         bitpack_bytes( &ctx, sys->animator_size, sys->animator_data );
+      }
+
       player->subsystem = frame->subsystem;
       player->down_bytes += msg->m_cbSize;
    }
@@ -218,22 +273,46 @@ static void remote_player_send_playerframe(void){
    struct player_subsystem_interface *sys = player_subsystems[sysid];
 
    if( sys->animator_size ){
-      u32 size = sizeof(netmsg_playerframe)+sys->animator_size;
-      netmsg_playerframe *frame = alloca(size);
+      u32 max_buf_size = sys->animator_size + sizeof(localplayer.sfx_buffer),
+          base_size = sizeof(struct netmsg_playerframe),
+          max_packet = base_size + max_buf_size;
+
+      netmsg_playerframe *frame = alloca( max_packet );
       frame->inetmsg_id = k_inetmsg_playerframe;
       frame->client = 0xff;
       frame->subsystem = localplayer.subsystem;
-      frame->timestamp = vg.time_real;
-      frame->boundary_hash = localplayer.boundary_hash;
       frame->instance_id = world_static.active_instance;
 
-      memcpy( frame->animdata, sys->animator_data, sys->animator_size );
+      bitpack_ctx ctx = {
+         .mode = k_bitpack_compress,
+         .buffer = frame->animdata,
+         .buffer_len = max_buf_size,
+         .bytes = 0
+      };
+
+      /* sfx
+       * ---------------------------------------------*/
+
+      frame->sound_effects = localplayer.sfx_buffer_count;
+      for( u32 i=0; i<localplayer.sfx_buffer_count; i ++ )
+         net_sfx_exchange( &ctx, &localplayer.sfx_buffer[i] );
+
+      /* animation 
+       * -----------------------------------------------*/
+
+      frame->timestamp = vg.time_real;
+      frame->boundary_hash = localplayer.boundary_hash;
+      if( sys->network_animator_exchange )
+         sys->network_animator_exchange( &ctx, sys->animator_data );
+      else
+         bitpack_bytes( &ctx, sys->animator_size, sys->animator_data );
 
-      netplayers.up_bytes += size;
+      u32 wire_size = base_size + ctx.bytes;
+      netplayers.up_bytes += wire_size;
 
       SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
             hSteamNetworkingSockets, network_client.remote, 
-            frame, size,
+            frame, wire_size,
             k_nSteamNetworkingSend_Unreliable, NULL );
    }
 }
@@ -305,7 +384,7 @@ static void remote_player_network_imgui( m4x4f pv ){
    if( network_client.state == k_ESteamNetworkingConnectionState_Connected ){
       ui_info( panel, "#-1: localplayer" );
       
-      snprintf( buf, 512, "U%.1f/D%.1fkbs", 
+      snprintf( buf, 512, "U%.3f/D%.3fkbs", 
                 netplayers.up_kbs, netplayers.down_kbs );
       ui_info( panel, buf );
 
@@ -512,6 +591,22 @@ static void render_remote_players( world_instance *world, camera *cam ){
    SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
 }
 
-/* TODO: Which world is the player in
- *       nametags with occlusion
- */
+static void remote_players_init(void){
+   for( u32 i=0; i<NETWORK_SFX_QUEUE_LENGTH; i ++ ){
+      netplayers.sfx_queue[i].system = k_player_subsystem_invalid;
+   }
+}
+
+static void remote_sfx_pre_update(void){
+   for( u32 i=0; i<NETWORK_SFX_QUEUE_LENGTH; i ++ ){
+      struct net_sfx *si = &netplayers.sfx_queue[i];
+
+      if( si->system != k_player_subsystem_invalid ){
+         si->subframe -= vg.time_frame_delta;
+         if( si->subframe <= 0.0f ){
+            net_sfx_play( si );
+            si->system = k_player_subsystem_invalid;
+         }
+      }
+   }
+}